diff --git a/bsp_q7s/ObjectFactory.cpp b/bsp_q7s/ObjectFactory.cpp
index aed9e23e..72e11d44 100644
--- a/bsp_q7s/ObjectFactory.cpp
+++ b/bsp_q7s/ObjectFactory.cpp
@@ -34,7 +34,7 @@
 #include <fsfw/osal/linux/TcUnixUdpPollingTask.h>
 
 #if TEST_LIBGPIOD == 1
-#include "LibgpiodTest.h"
+#include <linux/boardtest/LibgpiodTest.h>
 #endif
 
 void Factory::setStaticFrameworkObjectIds() {
diff --git a/bsp_q7s/boardtest/CMakeLists.txt b/bsp_q7s/boardtest/CMakeLists.txt
index 7e59ddb9..0599b73f 100644
--- a/bsp_q7s/boardtest/CMakeLists.txt
+++ b/bsp_q7s/boardtest/CMakeLists.txt
@@ -1,5 +1,4 @@
 target_sources(${TARGET_NAME} PRIVATE
-	LibgpiodTest.cpp
 )
 
 
diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt
index 9a25fdff..9101e15d 100644
--- a/linux/CMakeLists.txt
+++ b/linux/CMakeLists.txt
@@ -2,4 +2,5 @@ add_subdirectory(gpio)
 add_subdirectory(i2c)
 add_subdirectory(csp)
 add_subdirectory(spi)
+add_subdirectory(boardtest)
 
diff --git a/linux/boardtest/CMakeLists.txt b/linux/boardtest/CMakeLists.txt
new file mode 100644
index 00000000..0fa4e322
--- /dev/null
+++ b/linux/boardtest/CMakeLists.txt
@@ -0,0 +1,10 @@
+target_sources(${TARGET_NAME} PRIVATE
+	LibgpiodTest.cpp
+	I2cTestClass.cpp
+	SpiTestClass.cpp
+	UartTestClass.cpp
+)
+
+
+
+
diff --git a/linux/boardtest/I2cTestClass.cpp b/linux/boardtest/I2cTestClass.cpp
new file mode 100644
index 00000000..66c16b33
--- /dev/null
+++ b/linux/boardtest/I2cTestClass.cpp
@@ -0,0 +1,8 @@
+#include <linux/boardtest/I2cTestClass.h>
+
+I2cTestClass::I2cTestClass(object_id_t objectId): TestTask(objectId) {
+}
+
+ReturnValue_t I2cTestClass::performPeriodicAction() {
+    return HasReturnvaluesIF::RETURN_OK;
+}
diff --git a/linux/boardtest/I2cTestClass.h b/linux/boardtest/I2cTestClass.h
new file mode 100644
index 00000000..172a7f71
--- /dev/null
+++ b/linux/boardtest/I2cTestClass.h
@@ -0,0 +1,17 @@
+#ifndef LINUX_BOARDTEST_I2CTESTCLASS_H_
+#define LINUX_BOARDTEST_I2CTESTCLASS_H_
+
+#include <test/testtasks/TestTask.h>
+
+class I2cTestClass: public TestTask {
+public:
+    I2cTestClass(object_id_t objectId);
+
+    ReturnValue_t performPeriodicAction() override;
+private:
+
+};
+
+
+
+#endif /* LINUX_BOARDTEST_I2CTESTCLASS_H_ */
diff --git a/bsp_q7s/boardtest/LibgpiodTest.cpp b/linux/boardtest/LibgpiodTest.cpp
similarity index 100%
rename from bsp_q7s/boardtest/LibgpiodTest.cpp
rename to linux/boardtest/LibgpiodTest.cpp
diff --git a/bsp_q7s/boardtest/LibgpiodTest.h b/linux/boardtest/LibgpiodTest.h
similarity index 100%
rename from bsp_q7s/boardtest/LibgpiodTest.h
rename to linux/boardtest/LibgpiodTest.h
diff --git a/linux/boardtest/SpiTestClass.cpp b/linux/boardtest/SpiTestClass.cpp
new file mode 100644
index 00000000..daf38749
--- /dev/null
+++ b/linux/boardtest/SpiTestClass.cpp
@@ -0,0 +1,8 @@
+#include <linux/boardtest/SpiTestClass.h>
+
+SpiTestClass::SpiTestClass(object_id_t objectId): TestTask(objectId) {
+}
+
+ReturnValue_t SpiTestClass::performPeriodicAction() {
+    return HasReturnvaluesIF::RETURN_OK;
+}
diff --git a/linux/boardtest/SpiTestClass.h b/linux/boardtest/SpiTestClass.h
new file mode 100644
index 00000000..b3f10222
--- /dev/null
+++ b/linux/boardtest/SpiTestClass.h
@@ -0,0 +1,18 @@
+#ifndef LINUX_BOARDTEST_SPITESTCLASS_H_
+#define LINUX_BOARDTEST_SPITESTCLASS_H_
+
+#include <test/testtasks/TestTask.h>
+
+class SpiTestClass: public TestTask {
+public:
+    SpiTestClass(object_id_t objectId);
+
+    ReturnValue_t performPeriodicAction() override;
+private:
+
+};
+
+
+
+
+#endif /* LINUX_BOARDTEST_SPITESTCLASS_H_ */
diff --git a/linux/boardtest/UartTestClass.cpp b/linux/boardtest/UartTestClass.cpp
new file mode 100644
index 00000000..dc9f79c3
--- /dev/null
+++ b/linux/boardtest/UartTestClass.cpp
@@ -0,0 +1,8 @@
+#include <linux/boardtest/UartTestClass.h>
+
+UartTestClass::UartTestClass(object_id_t objectId): TestTask(objectId) {
+}
+
+ReturnValue_t UartTestClass::performPeriodicAction() {
+    return HasReturnvaluesIF::RETURN_OK;
+}
diff --git a/linux/boardtest/UartTestClass.h b/linux/boardtest/UartTestClass.h
new file mode 100644
index 00000000..406d2af5
--- /dev/null
+++ b/linux/boardtest/UartTestClass.h
@@ -0,0 +1,15 @@
+#ifndef LINUX_BOARDTEST_UARTTESTCLASS_H_
+#define LINUX_BOARDTEST_UARTTESTCLASS_H_
+
+#include <test/testtasks/TestTask.h>
+
+class UartTestClass: public TestTask {
+public:
+    UartTestClass(object_id_t objectId);
+
+    ReturnValue_t performPeriodicAction() override;
+private:
+
+};
+
+#endif /* LINUX_BOARDTEST_UARTTESTCLASS_H_ */