diff --git a/cuda/test/base/CMakeLists.txt b/cuda/test/base/CMakeLists.txt
index 174f4533c52..d4260c6e934 100644
--- a/cuda/test/base/CMakeLists.txt
+++ b/cuda/test/base/CMakeLists.txt
@@ -1,13 +1,13 @@
-ginkgo_create_cuda_test(array)
+ginkgo_create_test(array RESOURCE_TYPE cudagpu)
 ginkgo_create_cuda_test(cuda_executor)
-ginkgo_create_cuda_test(index_set)
+ginkgo_create_test(index_set RESOURCE_TYPE cudagpu)
 if(GINKGO_HAVE_HWLOC)
     find_package(NUMA REQUIRED)
     ginkgo_create_cuda_test(cuda_executor_topology ADDITIONAL_LIBRARIES NUMA::NUMA)
 endif()
 ginkgo_create_cuda_test(exception_helpers)
 ginkgo_create_cuda_test(kernel_launch)
-ginkgo_create_cuda_test(lin_op)
+ginkgo_create_test(lin_op RESOURCE_TYPE cudagpu)
 ginkgo_create_cuda_test(math)
-ginkgo_create_cuda_test(memory)
-ginkgo_create_cuda_test(scoped_device_id NO_RESOURCES)
+ginkgo_create_test(memory RESOURCE_TYPE cudagpu)
+ginkgo_create_cuda_test(scoped_device_id)
diff --git a/cuda/test/base/array.cu b/cuda/test/base/array.cpp
similarity index 100%
rename from cuda/test/base/array.cu
rename to cuda/test/base/array.cpp
diff --git a/cuda/test/base/index_set.cu b/cuda/test/base/index_set.cpp
similarity index 100%
rename from cuda/test/base/index_set.cu
rename to cuda/test/base/index_set.cpp
diff --git a/cuda/test/base/lin_op.cu b/cuda/test/base/lin_op.cpp
similarity index 100%
rename from cuda/test/base/lin_op.cu
rename to cuda/test/base/lin_op.cpp
diff --git a/cuda/test/base/memory.cu b/cuda/test/base/memory.cpp
similarity index 100%
rename from cuda/test/base/memory.cu
rename to cuda/test/base/memory.cpp
diff --git a/hip/test/base/CMakeLists.txt b/hip/test/base/CMakeLists.txt
index ed32ab5b6a7..bfe8c8be96a 100644
--- a/hip/test/base/CMakeLists.txt
+++ b/hip/test/base/CMakeLists.txt
@@ -1,18 +1,18 @@
 ginkgo_create_hip_test(hip_executor)
-ginkgo_create_test(index_set)
+ginkgo_create_test(index_set RESOURCE_TYPE hipgpu)
 if(GINKGO_HAVE_HWLOC)
     find_package(NUMA REQUIRED)
     ginkgo_create_hip_test(hip_executor_topology ADDITIONAL_LIBRARIES NUMA::NUMA)
 endif()
 ginkgo_create_hip_test(kernel_launch)
 # correct flags for kernel_launch.hpp are set in GINKGO_HIPCC_OPTIONS
-ginkgo_create_hip_test(lin_op)
+ginkgo_create_test(lin_op RESOURCE_TYPE hipgpu)
 ginkgo_create_hip_test(math)
-ginkgo_create_hip_test(memory)
+ginkgo_create_test(memory RESOURCE_TYPE hipgpu)
 # Only hcc needs the libraries. nvcc only requires the headers.
 if (GINKGO_HIP_PLATFORM MATCHES "${HIP_PLATFORM_AMD_REGEX}")
     ginkgo_create_hip_test(exception_helpers ADDITIONAL_LIBRARIES roc::hipblas roc::hipsparse hip::hiprand roc::rocrand)
 else()
     ginkgo_create_hip_test(exception_helpers)
 endif()
-ginkgo_create_hip_test(scoped_device_id NO_RESOURCES)
+ginkgo_create_hip_test(scoped_device_id)
diff --git a/hip/test/base/lin_op.hip.cpp b/hip/test/base/lin_op.cpp
similarity index 100%
rename from hip/test/base/lin_op.hip.cpp
rename to hip/test/base/lin_op.cpp
diff --git a/hip/test/base/memory.hip.cpp b/hip/test/base/memory.cpp
similarity index 100%
rename from hip/test/base/memory.hip.cpp
rename to hip/test/base/memory.cpp
diff --git a/hip/test/matrix/CMakeLists.txt b/hip/test/matrix/CMakeLists.txt
index 82db4b8b376..a52069daea0 100644
--- a/hip/test/matrix/CMakeLists.txt
+++ b/hip/test/matrix/CMakeLists.txt
@@ -1,4 +1,4 @@
-ginkgo_create_hip_test(fbcsr_kernels)
+ginkgo_create_test(fbcsr_kernels RESOURCE_TYPE hipgpu)
 if (hipfft_FOUND)
     ginkgo_create_hip_test(fft_kernels)
 endif()
diff --git a/hip/test/matrix/fbcsr_kernels.hip.cpp b/hip/test/matrix/fbcsr_kernels.cpp
similarity index 100%
rename from hip/test/matrix/fbcsr_kernels.hip.cpp
rename to hip/test/matrix/fbcsr_kernels.cpp
diff --git a/hip/test/solver/CMakeLists.txt b/hip/test/solver/CMakeLists.txt
index a3b86589410..fcbb3de0c47 100644
--- a/hip/test/solver/CMakeLists.txt
+++ b/hip/test/solver/CMakeLists.txt
@@ -1,2 +1,2 @@
-ginkgo_create_test(lower_trs_kernels)
-ginkgo_create_test(upper_trs_kernels)
+ginkgo_create_test(lower_trs_kernels RESOURCE_TYPE hipgpu)
+ginkgo_create_test(upper_trs_kernels RESOURCE_TYPE hipgpu)
diff --git a/hip/test/utils/CMakeLists.txt b/hip/test/utils/CMakeLists.txt
index a6c52f65d9c..d9ec2ff29a7 100644
--- a/hip/test/utils/CMakeLists.txt
+++ b/hip/test/utils/CMakeLists.txt
@@ -1 +1 @@
-ginkgo_create_hip_test(assertions_test)
+ginkgo_create_test(assertions_test RESOURCE_TYPE hipgpu)
diff --git a/hip/test/utils/assertions_test.hip.cpp b/hip/test/utils/assertions_test.cpp
similarity index 100%
rename from hip/test/utils/assertions_test.hip.cpp
rename to hip/test/utils/assertions_test.cpp