diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d2ba7130bf67bfb0b64cb397bb40b22c3ca68a0a..abdbe2724f14899743a04d284528c45dbe5e63af 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,32 +2,27 @@ cmake_minimum_required(VERSION 3.8 FATAL_ERROR)
 
 ########################### Executables
 
-if (CUDA_FOUND OR CUDA_ON_CPU)
-        set(CUDA_SOURCES Operators/Vector/vector_dist_operators_unit_tests.cu
-                                         Operators/Vector/vector_dist_operators_apply_kernel_unit_tests.cu)
-endif()
-
-if (CUDA_ON_BACKEND STREQUAL "OpenMP" OR CUDA_ON_BACKEND STREQUAL "SEQUENTIAL")
-        set_source_files_properties(${CUDA_SOURCES} PROPERTIES LANGUAGE CXX)
-        set_source_files_properties(${CUDA_SOURCES} PROPERTIES COMPILE_FLAGS "-D__NVCC__ -DCUDART_VERSION=11000")
-        if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-                add_definitions("-x c++")
-        endif()
-endif()
-
 if (NOT CUDA_ON_BACKEND STREQUAL "None")
 	set(CUDA_SOURCES Operators/Vector/vector_dist_operators_unit_tests.cu
-			 	 	 OdeIntegrators/tests/Odeintegrators_test_gpu.cu
 					 Operators/Vector/vector_dist_operators_apply_kernel_unit_tests.cu)
 endif()
 
 if (CUDA_ON_BACKEND STREQUAL "CUDA")
-	set(CUDA_SOURCES DCPSE/DCPSE_op/tests/DCPSE_op_Solver_test.cu
+	set(CUDA_SOURCES ${CUDA_SOURCES} DCPSE/DCPSE_op/tests/DCPSE_op_Solver_test.cu
 			                 DCPSE/DCPSE_op/tests/DCPSE_op_test_base_tests.cu
 					 #DCPSE/DCPSE_op/tests/DCPSE_op_subset_test.cu
+					 OdeIntegrators/tests/Odeintegrators_test_gpu.cu
 			                 DCPSE/DCPSE_op/tests/DCPSE_op_test_temporal.cu)
 endif()
 
+if (CUDA_ON_BACKEND STREQUAL "OpenMP" OR CUDA_ON_BACKEND STREQUAL "SEQUENTIAL")
+        set_source_files_properties(${CUDA_SOURCES} PROPERTIES LANGUAGE CXX)
+        set_source_files_properties(${CUDA_SOURCES} PROPERTIES COMPILE_FLAGS "-D__NVCC__ -DCUDART_VERSION=11000")
+        if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+                add_definitions("-x c++")
+        endif()
+endif()
+
 if ( CUDA_ON_BACKEND STREQUAL "HIP" AND HIP_FOUND )
 
         list(APPEND HIP_HIPCC_FLAGS ${CMAKE_CXX_FLAGS_DEBUG})