diff --git a/unit_test/batched/Test_Batched.hpp b/unit_test/batched/Test_Batched.hpp
index 7952a74f5e..3b0c79ee80 100644
--- a/unit_test/batched/Test_Batched.hpp
+++ b/unit_test/batched/Test_Batched.hpp
@@ -7,6 +7,9 @@
 #include "Test_Batched_SerialGemm.hpp"
 #include "Test_Batched_SerialGemm_Real.hpp"
 #include "Test_Batched_SerialGemm_Complex.hpp"
+#include "Test_Batched_BatchedGemm.hpp"
+#include "Test_Batched_BatchedGemm_Real.hpp"
+#include "Test_Batched_BatchedGemm_Complex.hpp"
 #include "Test_Batched_SerialGemv.hpp"
 #include "Test_Batched_SerialGemv_Real.hpp"
 #include "Test_Batched_SerialGemv_Complex.hpp"
diff --git a/unit_test/cuda/Test_Cuda_Batched_BatchedGemm_Complex.cpp b/unit_test/cuda/Test_Cuda_Batched_BatchedGemm_Complex.cpp
deleted file mode 100644
index bad111da49..0000000000
--- a/unit_test/cuda/Test_Cuda_Batched_BatchedGemm_Complex.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "Test_Serial.hpp"
-#include "Test_Batched_BatchedGemm.hpp"
-#include "Test_Batched_BatchedGemm_Complex.hpp"
diff --git a/unit_test/cuda/Test_Cuda_Batched_BatchedGemm_Real.cpp b/unit_test/cuda/Test_Cuda_Batched_BatchedGemm_Real.cpp
deleted file mode 100644
index f0c4cd7011..0000000000
--- a/unit_test/cuda/Test_Cuda_Batched_BatchedGemm_Real.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "Test_Cuda.hpp"
-#include "Test_Batched_BatchedGemm.hpp"
-#include "Test_Batched_BatchedGemm_Real.hpp"
diff --git a/unit_test/openmp/Test_OpenMP_Batched_BatchedGemm_Complex.cpp b/unit_test/openmp/Test_OpenMP_Batched_BatchedGemm_Complex.cpp
deleted file mode 100644
index bad111da49..0000000000
--- a/unit_test/openmp/Test_OpenMP_Batched_BatchedGemm_Complex.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "Test_Serial.hpp"
-#include "Test_Batched_BatchedGemm.hpp"
-#include "Test_Batched_BatchedGemm_Complex.hpp"
diff --git a/unit_test/openmp/Test_OpenMP_Batched_BatchedGemm_Real.cpp b/unit_test/openmp/Test_OpenMP_Batched_BatchedGemm_Real.cpp
deleted file mode 100644
index 9f78063ad5..0000000000
--- a/unit_test/openmp/Test_OpenMP_Batched_BatchedGemm_Real.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "Test_OpenMP.hpp"
-#include "Test_Batched_BatchedGemm.hpp"
-#include "Test_Batched_BatchedGemm_Real.hpp"
diff --git a/unit_test/serial/Test_Serial_Batched_BatchedGemm_Complex.cpp b/unit_test/serial/Test_Serial_Batched_BatchedGemm_Complex.cpp
deleted file mode 100644
index bad111da49..0000000000
--- a/unit_test/serial/Test_Serial_Batched_BatchedGemm_Complex.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "Test_Serial.hpp"
-#include "Test_Batched_BatchedGemm.hpp"
-#include "Test_Batched_BatchedGemm_Complex.hpp"
diff --git a/unit_test/serial/Test_Serial_Batched_BatchedGemm_Real.cpp b/unit_test/serial/Test_Serial_Batched_BatchedGemm_Real.cpp
deleted file mode 100644
index ab130c550a..0000000000
--- a/unit_test/serial/Test_Serial_Batched_BatchedGemm_Real.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "Test_Serial.hpp"
-#include "Test_Batched_BatchedGemm.hpp"
-#include "Test_Batched_BatchedGemm_Real.hpp"