diff --git a/frame_serialize/CMakeLists.txt b/frame_serialize/CMakeLists.txt
index 999a530a..0d9b62ee 100644
--- a/frame_serialize/CMakeLists.txt
+++ b/frame_serialize/CMakeLists.txt
@@ -11,5 +11,4 @@ ADD_LIBRARY(FrameSerialize STATIC
         tinycbor/src/cborpretty.c
         tinycbor/src/cborerrorstrings.c
         tinycbor/src/cbor.h
-        tinycbor/src/tinycbor-version.h CborErr.h StartMessage.h EndMessage.h CborUtil.h
-        stream2.h stream2.c)
+        tinycbor/src/tinycbor-version.h CborErr.h StartMessage.h EndMessage.h CborUtil.h)
diff --git a/tests/CBORTest.cpp b/tests/CBORTest.cpp
index 5126d0fd..3937338a 100644
--- a/tests/CBORTest.cpp
+++ b/tests/CBORTest.cpp
@@ -5,8 +5,8 @@
 
 #include "../frame_serialize/JFJochFrameSerializer.h"
 #include "../frame_serialize/JFJochFrameDeserializer.h"
-#include "../frame_serialize/stream2.h"
 #include "../compression/JFJochCompressor.h"
+#include "stream2.h"
 
 TEST_CASE("CBORSerialize_Start", "[CBOR]") {
     JFJochFrameSerializer serializer(8*1024*1024);
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index b1efdd72..381bdafd 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -24,7 +24,8 @@ ADD_EXECUTABLE(CatchTest
         JFCalibrationTest.cpp
         RadialIntegrationTest.cpp
         StatusVectorTest.cpp ProcessRawPacketTest.cpp
-        CBORTest.cpp JFConversionTest.cpp DetectorGeometryTest.cpp JFJochBrokerParserTest.cpp DetectorSetupTest.cpp)
+        CBORTest.cpp ../tests/stream2.h ../tests/stream2.c
+        JFConversionTest.cpp DetectorGeometryTest.cpp JFJochBrokerParserTest.cpp DetectorSetupTest.cpp)
 
 target_link_libraries(CatchTest JFJochBroker JFJochReceiver JFJochWriter ImageAnalysis CommonFunctions HLSSimulation)
 target_include_directories(CatchTest PRIVATE .)
diff --git a/frame_serialize/stream2.c b/tests/stream2.c
similarity index 99%
rename from frame_serialize/stream2.c
rename to tests/stream2.c
index 3f6c50b5..7940c19e 100644
--- a/frame_serialize/stream2.c
+++ b/tests/stream2.c
@@ -1,3 +1,6 @@
+// Copyright (2019-2023) Paul Scherrer Institute
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // DECTRIS proprietary license
 
 #define __STDC_WANT_IEC_60559_TYPES_EXT__
@@ -16,7 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "tinycbor/src/cbor.h"
+#include "../frame_serialize/tinycbor/src/cbor.h"
 
 enum { MAX_KEY_LEN = 64 };
 
diff --git a/frame_serialize/stream2.h b/tests/stream2.h
similarity index 100%
rename from frame_serialize/stream2.h
rename to tests/stream2.h