diff --git a/cmake/tests.cmake b/cmake/tests.cmake
index 04b013d82..789ae4f1c 100644
--- a/cmake/tests.cmake
+++ b/cmake/tests.cmake
@@ -41,67 +41,66 @@ else()
 endif()
 
 set(lite_test_protos
-  google/protobuf/map_lite_unittest.proto
-  google/protobuf/unittest_import_lite.proto
-  google/protobuf/unittest_import_public_lite.proto
-  google/protobuf/unittest_lite.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/map_lite_unittest.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_import_lite.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_import_public_lite.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_lite.proto
 )
 
 set(tests_protos
-  google/protobuf/any_test.proto
-  google/protobuf/compiler/cpp/test_bad_identifiers.proto
-  google/protobuf/compiler/cpp/test_large_enum_value.proto
-  google/protobuf/map_proto2_unittest.proto
-  google/protobuf/map_unittest.proto
-  google/protobuf/unittest.proto
-  google/protobuf/unittest_arena.proto
-  google/protobuf/unittest_custom_options.proto
-  google/protobuf/unittest_drop_unknown_fields.proto
-  google/protobuf/unittest_embed_optimize_for.proto
-  google/protobuf/unittest_empty.proto
-  google/protobuf/unittest_enormous_descriptor.proto
-  google/protobuf/unittest_import.proto
-  google/protobuf/unittest_import_public.proto
-  google/protobuf/unittest_lazy_dependencies.proto
-  google/protobuf/unittest_lazy_dependencies_custom_option.proto
-  google/protobuf/unittest_lazy_dependencies_enum.proto
-  google/protobuf/unittest_lite_imports_nonlite.proto
-  google/protobuf/unittest_mset.proto
-  google/protobuf/unittest_mset_wire_format.proto
-  google/protobuf/unittest_no_field_presence.proto
-  google/protobuf/unittest_no_generic_services.proto
-  google/protobuf/unittest_optimize_for.proto
-  google/protobuf/unittest_preserve_unknown_enum.proto
-  google/protobuf/unittest_preserve_unknown_enum2.proto
-  google/protobuf/unittest_proto3.proto
-  google/protobuf/unittest_proto3_arena.proto
-  google/protobuf/unittest_proto3_arena_lite.proto
-  google/protobuf/unittest_proto3_lite.proto
-  google/protobuf/unittest_proto3_optional.proto
-  google/protobuf/unittest_well_known_types.proto
-  google/protobuf/util/internal/testdata/anys.proto
-  google/protobuf/util/internal/testdata/books.proto
-  google/protobuf/util/internal/testdata/default_value.proto
-  google/protobuf/util/internal/testdata/default_value_test.proto
-  google/protobuf/util/internal/testdata/field_mask.proto
-  google/protobuf/util/internal/testdata/maps.proto
-  google/protobuf/util/internal/testdata/oneofs.proto
-  google/protobuf/util/internal/testdata/proto3.proto
-  google/protobuf/util/internal/testdata/struct.proto
-  google/protobuf/util/internal/testdata/timestamp_duration.proto
-  google/protobuf/util/internal/testdata/wrappers.proto
-  google/protobuf/util/json_format.proto
-  google/protobuf/util/json_format_proto3.proto
-  google/protobuf/util/message_differencer_unittest.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/any_test.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/test_bad_identifiers.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/test_large_enum_value.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/map_proto2_unittest.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/map_unittest.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_arena.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_custom_options.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_drop_unknown_fields.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_embed_optimize_for.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_empty.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_enormous_descriptor.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_import.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_import_public.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_lazy_dependencies.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_lazy_dependencies_custom_option.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_lazy_dependencies_enum.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_lite_imports_nonlite.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_mset.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_mset_wire_format.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_no_field_presence.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_no_generic_services.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_optimize_for.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_preserve_unknown_enum.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_preserve_unknown_enum2.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3_arena.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3_arena_lite.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3_lite.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3_optional.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_well_known_types.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/testdata/anys.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/testdata/books.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/testdata/default_value.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/testdata/default_value_test.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/testdata/field_mask.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/testdata/maps.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/testdata/oneofs.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/testdata/proto3.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/testdata/struct.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/testdata/timestamp_duration.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/testdata/wrappers.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/json_format.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/json_format_proto3.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/message_differencer_unittest.proto
 )
 
 macro(compile_proto_file filename)
-  get_filename_component(dirname ${filename} PATH)
-  get_filename_component(basename ${filename} NAME_WE)
+  string(REPLACE .proto .pb.cc pb_file ${filename})
   add_custom_command(
-    OUTPUT ${protobuf_SOURCE_DIR}/src/${dirname}/${basename}.pb.cc
-    DEPENDS ${protobuf_PROTOC_EXE} ${protobuf_SOURCE_DIR}/src/${dirname}/${basename}.proto
-    COMMAND ${protobuf_PROTOC_EXE} ${protobuf_SOURCE_DIR}/src/${dirname}/${basename}.proto
+    OUTPUT ${pb_file}
+    DEPENDS ${protobuf_PROTOC_EXE} ${filename}
+    COMMAND ${protobuf_PROTOC_EXE} ${filename}
         --proto_path=${protobuf_SOURCE_DIR}/src
         --cpp_out=${protobuf_SOURCE_DIR}/src
         --experimental_allow_proto3_optional
@@ -111,17 +110,13 @@ endmacro(compile_proto_file)
 set(lite_test_proto_files)
 foreach(proto_file ${lite_test_protos})
   compile_proto_file(${proto_file})
-  string(REPLACE .proto .pb.cc pb_file ${proto_file})
-  set(lite_test_proto_files ${lite_test_proto_files}
-      ${protobuf_SOURCE_DIR}/src/${pb_file})
+  set(lite_test_proto_files ${lite_test_proto_files} ${pb_file})
 endforeach(proto_file)
 
 set(tests_proto_files)
 foreach(proto_file ${tests_protos})
   compile_proto_file(${proto_file})
-  string(REPLACE .proto .pb.cc pb_file ${proto_file})
-  set(tests_proto_files ${tests_proto_files}
-      ${protobuf_SOURCE_DIR}/src/${pb_file})
+  set(tests_proto_files ${tests_proto_files} ${pb_file})
 endforeach(proto_file)
 
 set(common_lite_test_files