diff --git a/Makefile b/Makefile
index 4445bf3..65fb47e 100644
--- a/Makefile
+++ b/Makefile
@@ -73,8 +73,12 @@ BLAS_SRCS = \
 #   $(BLAS_SRC_DIR_L1)/srotg.c
 BLAS_OBJS = $(BLAS_SRCS:.c=.o)
 
-TEST_SRC_DIR = ./tests/blas/level1
-TEST_SRCS = $(wildcard $(TEST_SRC_DIR)/*.c)
+TEST_SRC_DIR_L1 = ./tests/blas/level1
+TEST_SRC_DIR_L2 = ./tests/blas/level2
+TEST_SRC_DIR_L3 = ./tests/blas/level3
+TEST_SRCS = $(wildcard $(TEST_SRC_DIR_L1)/*.c) \
+            $(wildcard $(TEST_SRC_DIR_L2)/*.c) \
+            $(wildcard $(TEST_SRC_DIR_L3)/*.c)
 TEST_OBJS = $(TEST_SRCS:.c=.o)
 
 TEST_ALL_SRC = ./tests/test_all.c
@@ -96,7 +100,13 @@ $(TARGET): $(BLAS_OBJS)
 $(TEST_TARGET): $(TEST_OBJS) $(BLAS_OBJS) $(MUNIT_OBJ) $(TEST_ALL_OBJ)
 	$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
 
-$(TEST_OBJS): $(TEST_SRC_DIR)/%.o: $(TEST_SRC_DIR)/%.c
+$(TEST_OBJS): $(TEST_SRC_DIR_L1)/%.o: $(TEST_SRC_DIR_L1)/%.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
+$(TEST_OBJS): $(TEST_SRC_DIR_L2)/%.o: $(TEST_SRC_DIR_L2)/%.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
+$(TEST_OBJS): $(TEST_SRC_DIR_L3)/%.o: $(TEST_SRC_DIR_L3)/%.c
 	$(CC) $(CFLAGS) -c $< -o $@
 
 $(TEST_ALL_OBJ): $(TEST_ALL_SRC)
diff --git a/tests/blas/level1/test_dgemv.c b/tests/blas/level2/test_dgemv.c
similarity index 100%
rename from tests/blas/level1/test_dgemv.c
rename to tests/blas/level2/test_dgemv.c
diff --git a/tests/blas/level1/test_hgemv.c b/tests/blas/level2/test_hgemv.c
similarity index 100%
rename from tests/blas/level1/test_hgemv.c
rename to tests/blas/level2/test_hgemv.c
diff --git a/tests/blas/level1/test_qgemv.c b/tests/blas/level2/test_qgemv.c
similarity index 100%
rename from tests/blas/level1/test_qgemv.c
rename to tests/blas/level2/test_qgemv.c
diff --git a/tests/blas/level1/test_sgemv.c b/tests/blas/level2/test_sgemv.c
similarity index 100%
rename from tests/blas/level1/test_sgemv.c
rename to tests/blas/level2/test_sgemv.c
diff --git a/tests/blas/level1/test_dgemm.c b/tests/blas/level3/test_dgemm.c
similarity index 100%
rename from tests/blas/level1/test_dgemm.c
rename to tests/blas/level3/test_dgemm.c
diff --git a/tests/blas/level1/test_hgemm.c b/tests/blas/level3/test_hgemm.c
similarity index 100%
rename from tests/blas/level1/test_hgemm.c
rename to tests/blas/level3/test_hgemm.c
diff --git a/tests/blas/level1/test_qgemm.c b/tests/blas/level3/test_qgemm.c
similarity index 100%
rename from tests/blas/level1/test_qgemm.c
rename to tests/blas/level3/test_qgemm.c
diff --git a/tests/blas/level1/test_sgemm.c b/tests/blas/level3/test_sgemm.c
similarity index 100%
rename from tests/blas/level1/test_sgemm.c
rename to tests/blas/level3/test_sgemm.c