diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98a84cb66..237f186a6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -175,7 +175,7 @@ if(FSFW_BUILD_TESTS)
   configure_file(unittests/testcfg/TestsConfig.h.in tests/TestsConfig.h)
 
   project(${FSFW_TEST_TGT} CXX C)
-  add_executable(${FSFW_TEST_TGT})
+  add_executable(${FSFW_TEST_TGT} unittests/tmtcpacket/testCcsdsReader.cpp)
   if(IPO_SUPPORTED AND FSFW_ENABLE_IPO)
     set_property(TARGET ${FSFW_TEST_TGT} PROPERTY INTERPROCEDURAL_OPTIMIZATION
                                                   TRUE)
diff --git a/unittests/tmtcpacket/CMakeLists.txt b/unittests/tmtcpacket/CMakeLists.txt
index ea3eec217..9a08868e5 100644
--- a/unittests/tmtcpacket/CMakeLists.txt
+++ b/unittests/tmtcpacket/CMakeLists.txt
@@ -1,3 +1,4 @@
 target_sources(${FSFW_TEST_TGT} PRIVATE
-  TestCcsdsReader.cpp
+  testCcsdsCreator.cpp
+  testCcsdsReader.cpp
 )
diff --git a/unittests/tmtcpacket/TestCcsdsReader.cpp b/unittests/tmtcpacket/testCcsdsCreator.cpp
similarity index 97%
rename from unittests/tmtcpacket/TestCcsdsReader.cpp
rename to unittests/tmtcpacket/testCcsdsCreator.cpp
index 79d86eb15..fbd73b10c 100644
--- a/unittests/tmtcpacket/TestCcsdsReader.cpp
+++ b/unittests/tmtcpacket/testCcsdsCreator.cpp
@@ -3,9 +3,9 @@
 #include <cmath>
 
 #include "fsfw/tmtcpacket/SpacePacketCreator.h"
-#include "fsfw/tmtcpacket/SpacePacketReader.h"
 
-TEST_CASE("CCSDS Test", "[ccsds]") {
+
+TEST_CASE("CCSDS Creator", "[ccsds-creator]") {
   SpacePacketCreator base = SpacePacketCreator(ccsds::PacketType::TC, true, 0x02,
                                                ccsds::SequenceFlags::FIRST_SEGMENT, 0x34, 0x16);
   std::array<uint8_t, 6> buf{};
diff --git a/unittests/tmtcpacket/testCcsdsReader.cpp b/unittests/tmtcpacket/testCcsdsReader.cpp
new file mode 100644
index 000000000..d63f4cf07
--- /dev/null
+++ b/unittests/tmtcpacket/testCcsdsReader.cpp
@@ -0,0 +1,6 @@
+#include <catch2/catch_test_macros.hpp>
+#include "fsfw/tmtcpacket/SpacePacketReader.h"
+
+TEST_CASE("CCSDS Reader", "[ccsds-reader]") {
+
+}
\ No newline at end of file
diff --git a/unittests/tmtcpacket/TestPusTm.cpp b/unittests/tmtcpacket/testPusTm.cpp
similarity index 100%
rename from unittests/tmtcpacket/TestPusTm.cpp
rename to unittests/tmtcpacket/testPusTm.cpp