diff --git a/sycl/test-e2e/WorkGroupMemory/Dynamic/copy_dynamic_size.cpp b/sycl/test-e2e/WorkGroupScratchMemory/copy_dynamic_size.cpp
similarity index 100%
rename from sycl/test-e2e/WorkGroupMemory/Dynamic/copy_dynamic_size.cpp
rename to sycl/test-e2e/WorkGroupScratchMemory/copy_dynamic_size.cpp
diff --git a/sycl/test-e2e/WorkGroupMemory/Dynamic/dynamic_alloc_local_accessor.cpp b/sycl/test-e2e/WorkGroupScratchMemory/dynamic_alloc_local_accessor.cpp
similarity index 98%
rename from sycl/test-e2e/WorkGroupMemory/Dynamic/dynamic_alloc_local_accessor.cpp
rename to sycl/test-e2e/WorkGroupScratchMemory/dynamic_alloc_local_accessor.cpp
index a407d56077d5c..20d5d1ca917ad 100644
--- a/sycl/test-e2e/WorkGroupMemory/Dynamic/dynamic_alloc_local_accessor.cpp
+++ b/sycl/test-e2e/WorkGroupScratchMemory/dynamic_alloc_local_accessor.cpp
@@ -2,7 +2,7 @@
 // RUN: %{run} %t.out
 //
 
-// UNSUPPORTED: gpu-intel-gen12
+// UNSUPPORTED: gpu-intel-gen12, cpu
 // UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/16072
 
 // Test work_group_dynamic extension with allocation size specified at runtime
diff --git a/sycl/test-e2e/WorkGroupMemory/Dynamic/dynamic_alloc_ptr_alias.cpp b/sycl/test-e2e/WorkGroupScratchMemory/dynamic_alloc_ptr_alias.cpp
similarity index 98%
rename from sycl/test-e2e/WorkGroupMemory/Dynamic/dynamic_alloc_ptr_alias.cpp
rename to sycl/test-e2e/WorkGroupScratchMemory/dynamic_alloc_ptr_alias.cpp
index e56ccc66bc364..fdec5db02657d 100644
--- a/sycl/test-e2e/WorkGroupMemory/Dynamic/dynamic_alloc_ptr_alias.cpp
+++ b/sycl/test-e2e/WorkGroupScratchMemory/dynamic_alloc_ptr_alias.cpp
@@ -2,7 +2,7 @@
 // RUN: %{run} %t.out
 //
 
-// UNSUPPORTED: gpu-intel-gen12
+// UNSUPPORTED: gpu-intel-gen12, cpu
 // UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/16072
 
 // Test work_group_dynamic extension with allocation size specified at runtime
diff --git a/sycl/test-e2e/WorkGroupMemory/Dynamic/dynamic_allocation.cpp b/sycl/test-e2e/WorkGroupScratchMemory/dynamic_allocation.cpp
similarity index 98%
rename from sycl/test-e2e/WorkGroupMemory/Dynamic/dynamic_allocation.cpp
rename to sycl/test-e2e/WorkGroupScratchMemory/dynamic_allocation.cpp
index 76032271d7b5c..14848f1477e3a 100644
--- a/sycl/test-e2e/WorkGroupMemory/Dynamic/dynamic_allocation.cpp
+++ b/sycl/test-e2e/WorkGroupScratchMemory/dynamic_allocation.cpp
@@ -2,7 +2,7 @@
 // RUN: %{run} %t.out
 //
 
-// UNSUPPORTED: gpu-intel-gen12
+// UNSUPPORTED: gpu-intel-gen12, cpu
 // UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/16072
 
 // Test work_group_dynamic extension with allocation size specified at runtime.
diff --git a/sycl/test-e2e/WorkGroupMemory/Dynamic/dynamic_unused.cpp b/sycl/test-e2e/WorkGroupScratchMemory/dynamic_unused.cpp
similarity index 100%
rename from sycl/test-e2e/WorkGroupMemory/Dynamic/dynamic_unused.cpp
rename to sycl/test-e2e/WorkGroupScratchMemory/dynamic_unused.cpp
diff --git a/sycl/test-e2e/WorkGroupMemory/lit.local.cfg b/sycl/test-e2e/WorkGroupScratchMemory/lit.local.cfg
similarity index 100%
rename from sycl/test-e2e/WorkGroupMemory/lit.local.cfg
rename to sycl/test-e2e/WorkGroupScratchMemory/lit.local.cfg
diff --git a/sycl/test-e2e/WorkGroupStatic/lit.local.cfg b/sycl/test-e2e/WorkGroupStatic/lit.local.cfg
new file mode 100644
index 0000000000000..bafde197c494f
--- /dev/null
+++ b/sycl/test-e2e/WorkGroupStatic/lit.local.cfg
@@ -0,0 +1,3 @@
+
+# https://github.com/intel/llvm/issues/16072
+config.unsupported_features += ['hip']
diff --git a/sycl/test-e2e/WorkGroupMemory/Static/work_group_static_memory_block_scope.cpp b/sycl/test-e2e/WorkGroupStatic/work_group_static_memory_block_scope.cpp
similarity index 100%
rename from sycl/test-e2e/WorkGroupMemory/Static/work_group_static_memory_block_scope.cpp
rename to sycl/test-e2e/WorkGroupStatic/work_group_static_memory_block_scope.cpp
diff --git a/sycl/test-e2e/WorkGroupMemory/Static/work_group_static_memory_class_scope.cpp b/sycl/test-e2e/WorkGroupStatic/work_group_static_memory_class_scope.cpp
similarity index 100%
rename from sycl/test-e2e/WorkGroupMemory/Static/work_group_static_memory_class_scope.cpp
rename to sycl/test-e2e/WorkGroupStatic/work_group_static_memory_class_scope.cpp
diff --git a/sycl/test-e2e/WorkGroupMemory/Static/work_group_static_memory_namespace_scope.cpp b/sycl/test-e2e/WorkGroupStatic/work_group_static_memory_namespace_scope.cpp
similarity index 100%
rename from sycl/test-e2e/WorkGroupMemory/Static/work_group_static_memory_namespace_scope.cpp
rename to sycl/test-e2e/WorkGroupStatic/work_group_static_memory_namespace_scope.cpp