diff --git a/tests/dCommonTests/CMakeLists.txt b/tests/dCommonTests/CMakeLists.txt
index fb53ed03..74039be1 100644
--- a/tests/dCommonTests/CMakeLists.txt
+++ b/tests/dCommonTests/CMakeLists.txt
@@ -30,46 +30,11 @@ endif()
 # Link needed libraries
 target_link_libraries(dCommonTests ${COMMON_LIBRARIES} GTest::gtest_main)
 
-
-# Copy test files to the build directory where the executable runs from
-# Use a custom command to ensure files are copied when the target is built
-add_custom_command(TARGET dCommonTests POST_BUILD
-    # Copy AMF test files
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different
-        "${CMAKE_CURRENT_SOURCE_DIR}/TestBitStreams/AMFBitStreamTest.bin"
-        "$<TARGET_FILE_DIR:dCommonTests>/AMFBitStreamTest.bin"
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different
-        "${CMAKE_CURRENT_SOURCE_DIR}/TestBitStreams/AMFBitStreamUnimplementedTest.bin"
-        "$<TARGET_FILE_DIR:dCommonTests>/AMFBitStreamUnimplementedTest.bin"
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different
-        "${CMAKE_CURRENT_SOURCE_DIR}/LxfmlTestFiles/test.lxfml"
-        "$<TARGET_FILE_DIR:dCommonTests>/test.lxfml"
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different
-        "${CMAKE_CURRENT_SOURCE_DIR}/LxfmlTestFiles/invalid_transform.lxfml"
-        "$<TARGET_FILE_DIR:dCommonTests>/invalid_transform.lxfml"
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different
-        "${CMAKE_CURRENT_SOURCE_DIR}/LxfmlTestFiles/empty_transform.lxfml"
-        "$<TARGET_FILE_DIR:dCommonTests>/empty_transform.lxfml"
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different
-        "${CMAKE_CURRENT_SOURCE_DIR}/LxfmlTestFiles/too_few_values.lxfml"
-        "$<TARGET_FILE_DIR:dCommonTests>/too_few_values.lxfml"
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different
-        "${CMAKE_CURRENT_SOURCE_DIR}/LxfmlTestFiles/non_numeric_transform.lxfml"
-        "$<TARGET_FILE_DIR:dCommonTests>/non_numeric_transform.lxfml"
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different
-        "${CMAKE_CURRENT_SOURCE_DIR}/LxfmlTestFiles/mixed_invalid_transform.lxfml"
-        "$<TARGET_FILE_DIR:dCommonTests>/mixed_invalid_transform.lxfml"
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different
-        "${CMAKE_CURRENT_SOURCE_DIR}/LxfmlTestFiles/no_bricks.lxfml"
-        "$<TARGET_FILE_DIR:dCommonTests>/no_bricks.lxfml"
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different
-        "${CMAKE_CURRENT_SOURCE_DIR}/LxfmlTestFiles/mixed_valid_invalid.lxfml"
-        "$<TARGET_FILE_DIR:dCommonTests>/mixed_valid_invalid.lxfml"
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different
-        "${CMAKE_CURRENT_SOURCE_DIR}/LxfmlTestFiles/deeply_nested.lxfml"
-        "$<TARGET_FILE_DIR:dCommonTests>/deeply_nested.lxfml"
-    COMMENT "Copying test files to executable directory"
-)
+# Copy test files to testing directory
+add_subdirectory(TestBitStreams)
+file(COPY ${TESTBITSTREAMS} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+add_subdirectory(LxfmlTestFiles)
+file(COPY ${LXFMLTESTFILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 
 # Discover the tests
 gtest_discover_tests(dCommonTests)