diff --git a/tests/src/cg/hipCGGridGroupType.cpp b/tests/src/runtimeApi/cooperativeGrps/hipCGGridGroupType.cpp
similarity index 99%
rename from tests/src/cg/hipCGGridGroupType.cpp
rename to tests/src/runtimeApi/cooperativeGrps/hipCGGridGroupType.cpp
index 882e9fd024..79f1cb1c38 100755
--- a/tests/src/cg/hipCGGridGroupType.cpp
+++ b/tests/src/runtimeApi/cooperativeGrps/hipCGGridGroupType.cpp
@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp
+ * BUILD: %t %s ../../test_common.cpp
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/src/cg/hipCGGridGroupTypeViaBaseType.cpp b/tests/src/runtimeApi/cooperativeGrps/hipCGGridGroupTypeViaBaseType.cpp
similarity index 99%
rename from tests/src/cg/hipCGGridGroupTypeViaBaseType.cpp
rename to tests/src/runtimeApi/cooperativeGrps/hipCGGridGroupTypeViaBaseType.cpp
index 29126d768c..7407f266dd 100755
--- a/tests/src/cg/hipCGGridGroupTypeViaBaseType.cpp
+++ b/tests/src/runtimeApi/cooperativeGrps/hipCGGridGroupTypeViaBaseType.cpp
@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp
+ * BUILD: %t %s ../../test_common.cpp
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/src/cg/hipCGGridGroupTypeViaPublicApi.cpp b/tests/src/runtimeApi/cooperativeGrps/hipCGGridGroupTypeViaPublicApi.cpp
similarity index 99%
rename from tests/src/cg/hipCGGridGroupTypeViaPublicApi.cpp
rename to tests/src/runtimeApi/cooperativeGrps/hipCGGridGroupTypeViaPublicApi.cpp
index 54de55b0c9..cb9d8d7c53 100755
--- a/tests/src/cg/hipCGGridGroupTypeViaPublicApi.cpp
+++ b/tests/src/runtimeApi/cooperativeGrps/hipCGGridGroupTypeViaPublicApi.cpp
@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp
+ * BUILD: %t %s ../../test_common.cpp
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/src/cg/hipCGMultiGridGroupType.cpp b/tests/src/runtimeApi/cooperativeGrps/hipCGMultiGridGroupType.cpp
similarity index 99%
rename from tests/src/cg/hipCGMultiGridGroupType.cpp
rename to tests/src/runtimeApi/cooperativeGrps/hipCGMultiGridGroupType.cpp
index 5a0529867a..cf50c652bc 100755
--- a/tests/src/cg/hipCGMultiGridGroupType.cpp
+++ b/tests/src/runtimeApi/cooperativeGrps/hipCGMultiGridGroupType.cpp
@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp
+ * BUILD: %t %s ../../test_common.cpp
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/src/cg/hipCGMultiGridGroupTypeViaBaseType.cpp b/tests/src/runtimeApi/cooperativeGrps/hipCGMultiGridGroupTypeViaBaseType.cpp
similarity index 99%
rename from tests/src/cg/hipCGMultiGridGroupTypeViaBaseType.cpp
rename to tests/src/runtimeApi/cooperativeGrps/hipCGMultiGridGroupTypeViaBaseType.cpp
index dae72f4cf8..c50c40f712 100644
--- a/tests/src/cg/hipCGMultiGridGroupTypeViaBaseType.cpp
+++ b/tests/src/runtimeApi/cooperativeGrps/hipCGMultiGridGroupTypeViaBaseType.cpp
@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp
+ * BUILD: %t %s ../../test_common.cpp
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/src/cg/hipCGMultiGridGroupTypeViaPublicApi.cpp b/tests/src/runtimeApi/cooperativeGrps/hipCGMultiGridGroupTypeViaPublicApi.cpp
similarity index 99%
rename from tests/src/cg/hipCGMultiGridGroupTypeViaPublicApi.cpp
rename to tests/src/runtimeApi/cooperativeGrps/hipCGMultiGridGroupTypeViaPublicApi.cpp
index 2f2f378931..608d298b5c 100644
--- a/tests/src/cg/hipCGMultiGridGroupTypeViaPublicApi.cpp
+++ b/tests/src/runtimeApi/cooperativeGrps/hipCGMultiGridGroupTypeViaPublicApi.cpp
@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp
+ * BUILD: %t %s ../../test_common.cpp
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/src/cg/hipCGThreadBlockType.cpp b/tests/src/runtimeApi/cooperativeGrps/hipCGThreadBlockType.cpp
similarity index 99%
rename from tests/src/cg/hipCGThreadBlockType.cpp
rename to tests/src/runtimeApi/cooperativeGrps/hipCGThreadBlockType.cpp
index c6d54ae8c6..dccac38bf3 100755
--- a/tests/src/cg/hipCGThreadBlockType.cpp
+++ b/tests/src/runtimeApi/cooperativeGrps/hipCGThreadBlockType.cpp
@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp
+ * BUILD: %t %s ../../test_common.cpp
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/src/cg/hipCGThreadBlockTypeViaBaseType.cpp b/tests/src/runtimeApi/cooperativeGrps/hipCGThreadBlockTypeViaBaseType.cpp
similarity index 99%
rename from tests/src/cg/hipCGThreadBlockTypeViaBaseType.cpp
rename to tests/src/runtimeApi/cooperativeGrps/hipCGThreadBlockTypeViaBaseType.cpp
index ce945c727d..b0a42782c0 100755
--- a/tests/src/cg/hipCGThreadBlockTypeViaBaseType.cpp
+++ b/tests/src/runtimeApi/cooperativeGrps/hipCGThreadBlockTypeViaBaseType.cpp
@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp
+ * BUILD: %t %s ../../test_common.cpp
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/src/cg/hipCGThreadBlockTypeViaPublicApi.cpp b/tests/src/runtimeApi/cooperativeGrps/hipCGThreadBlockTypeViaPublicApi.cpp
similarity index 99%
rename from tests/src/cg/hipCGThreadBlockTypeViaPublicApi.cpp
rename to tests/src/runtimeApi/cooperativeGrps/hipCGThreadBlockTypeViaPublicApi.cpp
index 71d57b11ed..e4a6a6e330 100755
--- a/tests/src/cg/hipCGThreadBlockTypeViaPublicApi.cpp
+++ b/tests/src/runtimeApi/cooperativeGrps/hipCGThreadBlockTypeViaPublicApi.cpp
@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp
+ * BUILD: %t %s ../../test_common.cpp
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/src/runtimeApi/module/hipLaunchCoopMultiKernel.cpp b/tests/src/runtimeApi/cooperativeGrps/hipLaunchCoopMultiKernel.cpp
similarity index 100%
rename from tests/src/runtimeApi/module/hipLaunchCoopMultiKernel.cpp
rename to tests/src/runtimeApi/cooperativeGrps/hipLaunchCoopMultiKernel.cpp
diff --git a/tests/src/runtimeApi/module/hipLaunchCooperativeKernel.cpp b/tests/src/runtimeApi/cooperativeGrps/hipLaunchCooperativeKernel.cpp
similarity index 98%
rename from tests/src/runtimeApi/module/hipLaunchCooperativeKernel.cpp
rename to tests/src/runtimeApi/cooperativeGrps/hipLaunchCooperativeKernel.cpp
index e0fcd4108b..52b2e00f50 100644
--- a/tests/src/runtimeApi/module/hipLaunchCooperativeKernel.cpp
+++ b/tests/src/runtimeApi/cooperativeGrps/hipLaunchCooperativeKernel.cpp
@@ -29,8 +29,7 @@ THE SOFTWARE.
 
 #include "hip/hip_runtime.h"
 #include "hip/hip_runtime_api.h"
-#include "hip/hcc_detail/device_library_decls.h"
-#include "hip/hcc_detail/hip_cooperative_groups.h"
+#include "hip/hip_cooperative_groups.h"
 #include <iostream>
 #include <chrono>
 #include "test_common.h"