diff --git a/UNITTESTS/mbed_unittest.py b/UNITTESTS/mbed_unittest.py
index 41039b0..9312c38 100755
--- a/UNITTESTS/mbed_unittest.py
+++ b/UNITTESTS/mbed_unittest.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 """
-Copyright (c) 2018, Arm Limited
+Copyright (c) 2018-2021, Arm Limited
 SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -71,9 +71,8 @@
                                  clean=options.clean)
 
     if options.compile_only:
-        # Create makefiles
-        src_path = os.path.relpath(pwd, options.build)
-        tool.create_makefiles(path_to_src=src_path,
+        # Create makefiles        
+        tool.create_makefiles(path_to_src=cwd,
                               generator=options.cmake_generator,
                               coverage_output_type=options.coverage,
                               debug=options.debug_build,
diff --git a/UNITTESTS/unit_test/test.py b/UNITTESTS/unit_test/test.py
index a2f8b89..dd0a716 100644
--- a/UNITTESTS/unit_test/test.py
+++ b/UNITTESTS/unit_test/test.py
@@ -86,6 +86,7 @@
         args = [cmake,
                 "-G",
                 generator,
+                "-DBUILD_TESTING=ON"
                 "-DCMAKE_MAKE_PROGRAM=%s" % self.make_program,
                 "-DCMAKE_CXX_COMPILER=%s" % get_cxx_tool(),
                 "-DCMAKE_C_COMPILER=%s" % get_c_tool()]