diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe2d88f..285c6dd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,9 +68,8 @@ enable_testing()
 find_package(GTest CONFIG REQUIRED)
 
 # C++/CUDA test executable
-add_executable(test_add
-  tests/test_add.cu
-)
+file(GLOB CPP_CUDA_TEST_SOURCES tests/cpp_tests/*.cu tests/cpp_tests/*.cpp)
+add_executable(test_add ${CPP_CUDA_TEST_SOURCES})
 
 target_link_libraries(test_add
   PRIVATE
diff --git a/tests/test_add.cu b/tests/cpp_tests/test_add.cu
similarity index 100%
rename from tests/test_add.cu
rename to tests/cpp_tests/test_add.cu
diff --git a/tests/test_geometry.py b/tests/python_tests/test_geometry.py
similarity index 100%
rename from tests/test_geometry.py
rename to tests/python_tests/test_geometry.py
diff --git a/tests/test_gpu_add.py b/tests/python_tests/test_gpu_add.py
similarity index 100%
rename from tests/test_gpu_add.py
rename to tests/python_tests/test_gpu_add.py