diff --git a/unsupported/test/CMakeLists.txt b/unsupported/test/CMakeLists.txt
index 0d7ed1db2..113dd79c1 100644
--- a/unsupported/test/CMakeLists.txt
+++ b/unsupported/test/CMakeLists.txt
@@ -140,13 +140,6 @@ endif()
 endif()
 
 if(EIGEN_TEST_CXX11)
-  if(EIGEN_TEST_SYCL)
-    ei_add_test_sycl(cxx11_tensor_sycl "-std=c++11")
-    ei_add_test_sycl(cxx11_tensor_sycl_forced_eval "-std=c++11")
-		ei_add_test_sycl(cxx11_tensor_sycl_broadcast "-std=c++11")
-		ei_add_test_sycl(cxx11_tensor_sycl_device "-std=c++11")
-  endif(EIGEN_TEST_SYCL)
-
   # It should be safe to always run these tests as there is some fallback code for
   # older compiler that don't support cxx11.
   set(CMAKE_CXX_STANDARD 11)
@@ -254,3 +247,11 @@ if(CUDA_FOUND AND EIGEN_TEST_CUDA)
 
   unset(EIGEN_ADD_TEST_FILENAME_EXTENSION)
 endif()
+
+
+if(EIGEN_TEST_SYCL)
+  ei_add_test_sycl(cxx11_tensor_sycl "-std=c++11")
+  ei_add_test_sycl(cxx11_tensor_forced_eval_sycl "-std=c++11")
+  ei_add_test_sycl(cxx11_tensor_broadcast_sycl "-std=c++11")
+  ei_add_test_sycl(cxx11_tensor_device_sycl "-std=c++11")
+endif(EIGEN_TEST_SYCL)
\ No newline at end of file
diff --git a/unsupported/test/cxx11_tensor_sycl_broadcast.cpp b/unsupported/test/cxx11_tensor_broadcast_sycl.cpp
similarity index 100%
rename from unsupported/test/cxx11_tensor_sycl_broadcast.cpp
rename to unsupported/test/cxx11_tensor_broadcast_sycl.cpp
diff --git a/unsupported/test/cxx11_tensor_sycl_device.cpp b/unsupported/test/cxx11_tensor_device_sycl.cpp
similarity index 100%
rename from unsupported/test/cxx11_tensor_sycl_device.cpp
rename to unsupported/test/cxx11_tensor_device_sycl.cpp
diff --git a/unsupported/test/cxx11_tensor_sycl_forced_eval.cpp b/unsupported/test/cxx11_tensor_forced_eval_sycl.cpp
similarity index 100%
rename from unsupported/test/cxx11_tensor_sycl_forced_eval.cpp
rename to unsupported/test/cxx11_tensor_forced_eval_sycl.cpp