diff --git a/tests/performance/perfDispatch/hipPerfDispatchSpeed.cpp b/tests/performance/dispatch/hipPerfDispatchSpeed.cpp
similarity index 98%
rename from tests/performance/perfDispatch/hipPerfDispatchSpeed.cpp
rename to tests/performance/dispatch/hipPerfDispatchSpeed.cpp
index 84ba73c3aa..12999ebc33 100644
--- a/tests/performance/perfDispatch/hipPerfDispatchSpeed.cpp
+++ b/tests/performance/dispatch/hipPerfDispatchSpeed.cpp
@@ -7,7 +7,7 @@
 #include "test_common.h"
 
 /* HIT_START
- * BUILD: %t %s ../../src/test_common.cpp timer.cpp EXCLUDE_HIP_PLATFORM nvcc
+ * BUILD: %t %s ../../src/test_common.cpp ../../src/timer.cpp EXCLUDE_HIP_PLATFORM nvcc
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/performance/perfDispatch/hipPerfBufferCopyRectSpeed.cpp b/tests/performance/memory/hipPerfBufferCopyRectSpeed.cpp
similarity index 98%
rename from tests/performance/perfDispatch/hipPerfBufferCopyRectSpeed.cpp
rename to tests/performance/memory/hipPerfBufferCopyRectSpeed.cpp
index 5000904af9..3cb3243e80 100644
--- a/tests/performance/perfDispatch/hipPerfBufferCopyRectSpeed.cpp
+++ b/tests/performance/memory/hipPerfBufferCopyRectSpeed.cpp
@@ -7,7 +7,7 @@
 #include "test_common.h"
 
 /* HIT_START
- * BUILD: %t %s ../../src/test_common.cpp timer.cpp EXCLUDE_HIP_PLATFORM nvcc
+ * BUILD: %t %s ../../src/test_common.cpp ../../src/timer.cpp EXCLUDE_HIP_PLATFORM nvcc
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/performance/perfDispatch/hipPerfBufferCopySpeed.cpp b/tests/performance/memory/hipPerfBufferCopySpeed.cpp
similarity index 98%
rename from tests/performance/perfDispatch/hipPerfBufferCopySpeed.cpp
rename to tests/performance/memory/hipPerfBufferCopySpeed.cpp
index 6f284ae7fb..d9a2d443a2 100644
--- a/tests/performance/perfDispatch/hipPerfBufferCopySpeed.cpp
+++ b/tests/performance/memory/hipPerfBufferCopySpeed.cpp
@@ -7,7 +7,7 @@
 #include "test_common.h"
 
 /* HIT_START
- * BUILD: %t %s ../../src/test_common.cpp timer.cpp EXCLUDE_HIP_PLATFORM nvcc
+ * BUILD: %t %s ../../src/test_common.cpp ../../src/timer.cpp EXCLUDE_HIP_PLATFORM nvcc
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/performance/memory/hipHostNumaAlloc.cpp b/tests/performance/memory/hipPerfHostNumaAlloc.cpp
similarity index 97%
rename from tests/performance/memory/hipHostNumaAlloc.cpp
rename to tests/performance/memory/hipPerfHostNumaAlloc.cpp
index 38401c8046..a5e60c8549 100644
--- a/tests/performance/memory/hipHostNumaAlloc.cpp
+++ b/tests/performance/memory/hipPerfHostNumaAlloc.cpp
@@ -34,7 +34,7 @@ THE SOFTWARE.
 #include <array>
 #include "hip/hip_runtime.h"
 /* HIT_START
- * BUILD_CMD: hipHostNumaAlloc %hc -I%S/../../src %S/%s %S/../../src/test_common.cpp -lnuma -o %T/%t EXCLUDE_HIP_PLATFORM nvcc
+ * BUILD_CMD: hipPerfHostNumaAlloc %hc -I%S/../../src %S/%s %S/../../src/test_common.cpp -lnuma -o %T/%t EXCLUDE_HIP_PLATFORM nvcc
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/performance/perfDispatch/timer.cpp b/tests/src/timer.cpp
similarity index 100%
rename from tests/performance/perfDispatch/timer.cpp
rename to tests/src/timer.cpp
diff --git a/tests/performance/perfDispatch/timer.h b/tests/src/timer.h
similarity index 100%
rename from tests/performance/perfDispatch/timer.h
rename to tests/src/timer.h