diff --git a/sycl/test/CMakeLists.txt b/sycl/test/CMakeLists.txt
index 00df5fd456ad3..4010c13d3b219 100644
--- a/sycl/test/CMakeLists.txt
+++ b/sycl/test/CMakeLists.txt
@@ -42,13 +42,6 @@ list(APPEND SYCL_DEPLOY_TEST_DEPS
   deploy-sycl-toolchain
   )
 
-add_lit_testsuite(check-sycl "Running the SYCL regression tests"
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ARGS ${RT_TEST_ARGS}
-  PARAMS "SYCL_BE=PI_OPENCL"
-  DEPENDS ${SYCL_TEST_DEPS}
-  )
-
 add_lit_testsuite(check-sycl-deploy "Running the SYCL regression tests"
   ${CMAKE_CURRENT_BINARY_DIR}
   ARGS ${DEPLOY_RT_TEST_ARGS}
@@ -56,10 +49,11 @@ add_lit_testsuite(check-sycl-deploy "Running the SYCL regression tests"
   DEPENDS ${SYCL_DEPLOY_TEST_DEPS}
   EXCLUDE_FROM_CHECK_ALL
   )
-set_target_properties(check-sycl PROPERTIES FOLDER "SYCL tests")
+set_target_properties(check-sycl-deploy PROPERTIES FOLDER "SYCL tests")
 
 add_lit_testsuites(SYCL ${CMAKE_CURRENT_SOURCE_DIR}
   DEPENDS ${SYCL_TEST_DEPS}
+  EXCLUDE_FROM_CHECK_ALL
   )
 
 add_lit_testsuites(SYCL-DEPLOY ${CMAKE_CURRENT_SOURCE_DIR}
@@ -76,16 +70,29 @@ add_lit_target(check-sycl-inline-asm
   PARAMS "SYCL_BE=PI_OPENCL"
   DEPENDS ${SYCL_TEST_DEPS}
   )
+set_target_properties(check-sycl-inline-asm PROPERTIES FOLDER "SYCL tests")
+
+add_lit_testsuite(check-sycl-opencl "Running the SYCL regression tests for OpenCL"
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ARGS ${RT_TEST_ARGS}
+  PARAMS "SYCL_BE=PI_OPENCL"
+  DEPENDS ${SYCL_TEST_DEPS}
+  EXCLUDE_FROM_CHECK_ALL
+  )
+set_target_properties(check-sycl-opencl PROPERTIES FOLDER "SYCL tests")
 
-add_lit_testsuite(check-level0 "Running the SYCL regression tests for Level Zero"
+add_lit_testsuite(check-sycl-level0 "Running the SYCL regression tests for Level Zero"
   ${CMAKE_CURRENT_BINARY_DIR}
   ARGS ${RT_TEST_ARGS}
   PARAMS "SYCL_BE=PI_LEVEL0"
   DEPENDS ${SYCL_TEST_DEPS}
   EXCLUDE_FROM_CHECK_ALL
   )
+set_target_properties(check-sycl-level0 PROPERTIES FOLDER "SYCL tests")
 
-add_dependencies(check-sycl check-level0)
+add_custom_target(check-sycl)
+add_dependencies(check-sycl check-sycl-opencl check-sycl-level0)
+set_target_properties(check-sycl PROPERTIES FOLDER "SYCL tests")
 
 if(SYCL_BUILD_PI_CUDA)
   add_lit_testsuite(check-sycl-cuda "Running the SYCL regression tests for CUDA"
@@ -93,12 +100,15 @@ if(SYCL_BUILD_PI_CUDA)
     ARGS ${RT_TEST_ARGS}
     PARAMS "SYCL_BE=PI_CUDA"
     DEPENDS ${SYCL_TEST_DEPS}
+    EXCLUDE_FROM_CHECK_ALL
   )
-
   set_target_properties(check-sycl-cuda PROPERTIES FOLDER "SYCL CUDA tests")
 
+  add_dependencies(check-sycl check-sycl-cuda)
+
   add_lit_testsuites(SYCL-CUDA ${CMAKE_CURRENT_SOURCE_DIR}
     PARAMS "SYCL_BE=PI_CUDA"
     DEPENDS ${SYCL_TEST_DEPS}
+    EXCLUDE_FROM_CHECK_ALL
   )
 endif()