diff --git a/lib/src/mac/CMakeLists.txt b/lib/src/mac/CMakeLists.txt
index 0a14d0143..1974aee4e 100644
--- a/lib/src/mac/CMakeLists.txt
+++ b/lib/src/mac/CMakeLists.txt
@@ -10,4 +10,6 @@ SET(SOURCES pdu.cc pdu_queue.cc mac_sch_pdu_nr.cc mac_rar_pdu_nr.cc)
 
 add_library(srsran_mac STATIC ${SOURCES})
 target_link_libraries(srsran_mac srsran_common)
-INSTALL(TARGETS srsran_mac DESTINATION ${LIBRARY_DIR})
\ No newline at end of file
+INSTALL(TARGETS srsran_mac DESTINATION ${LIBRARY_DIR})
+
+add_subdirectory(test)
\ No newline at end of file
diff --git a/lib/test/mac/CMakeLists.txt b/lib/src/mac/test/CMakeLists.txt
similarity index 100%
rename from lib/test/mac/CMakeLists.txt
rename to lib/src/mac/test/CMakeLists.txt
diff --git a/lib/test/mac/mac_pcap_test.cc b/lib/src/mac/test/mac_pcap_test.cc
similarity index 100%
rename from lib/test/mac/mac_pcap_test.cc
rename to lib/src/mac/test/mac_pcap_test.cc
diff --git a/lib/test/mac/mac_pdu_nr_test.cc b/lib/src/mac/test/mac_pdu_nr_test.cc
similarity index 100%
rename from lib/test/mac/mac_pdu_nr_test.cc
rename to lib/src/mac/test/mac_pdu_nr_test.cc
diff --git a/lib/test/mac/pdu_test.cc b/lib/src/mac/test/pdu_test.cc
similarity index 100%
rename from lib/test/mac/pdu_test.cc
rename to lib/src/mac/test/pdu_test.cc
diff --git a/lib/test/CMakeLists.txt b/lib/test/CMakeLists.txt
index 540fe5c6c..68667e222 100644
--- a/lib/test/CMakeLists.txt
+++ b/lib/test/CMakeLists.txt
@@ -8,7 +8,6 @@
 
 add_subdirectory(asn1)
 add_subdirectory(common)
-add_subdirectory(mac)
 add_subdirectory(phy)
 add_subdirectory(srslog)
 add_subdirectory(rlc)