diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index b4b6e701..efb604e0 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -15,19 +15,19 @@ include(GTestHelper)
 add_testhelper(runTestDevice
     SOURCES
     helper/runTestDevice.cxx
-    helper/devices/TestPairLeft.cxx
-    helper/devices/TestPairRight.cxx
-    helper/devices/TestPollIn.cxx
-    helper/devices/TestPollOut.cxx
-    helper/devices/TestPub.cxx
-    helper/devices/TestPull.cxx
-    helper/devices/TestPush.cxx
-    helper/devices/TestRep.cxx
-    helper/devices/TestReq.cxx
-    helper/devices/TestSub.cxx
-    helper/devices/TestTransferTimeout.cxx
-    helper/devices/TestWaitFor.cxx
-    helper/devices/TestExceptions.cxx
+    helper/devices/TestPairLeft.h
+    helper/devices/TestPairRight.h
+    helper/devices/TestPollIn.h
+    helper/devices/TestPollOut.h
+    helper/devices/TestPub.h
+    helper/devices/TestPull.h
+    helper/devices/TestPush.h
+    helper/devices/TestRep.h
+    helper/devices/TestReq.h
+    helper/devices/TestSub.h
+    helper/devices/TestTransferTimeout.h
+    helper/devices/TestWaitFor.h
+    helper/devices/TestExceptions.h
 
     LINKS FairMQ
 )
diff --git a/test/helper/devices/TestExceptions.cxx b/test/helper/devices/TestExceptions.h
similarity index 94%
rename from test/helper/devices/TestExceptions.cxx
rename to test/helper/devices/TestExceptions.h
index cbc51e22..0a58b724 100644
--- a/test/helper/devices/TestExceptions.cxx
+++ b/test/helper/devices/TestExceptions.h
@@ -6,6 +6,9 @@
  *                  copied verbatim in the file "LICENSE"                       *
  ********************************************************************************/
 
+#ifndef FAIR_MQ_TEST_EXCEPTIONS_H
+#define FAIR_MQ_TEST_EXCEPTIONS_H
+
 #include <FairMQDevice.h>
 #include <FairMQLogger.h>
 
@@ -19,7 +22,7 @@ namespace mq
 namespace test
 {
 
-class TestExceptions : public FairMQDevice
+class Exceptions : public FairMQDevice
 {
   public:
     auto Init() -> void override
@@ -82,3 +85,5 @@ class TestExceptions : public FairMQDevice
 } // namespace test
 } // namespace mq
 } // namespace fair
+
+#endif /* FAIR_MQ_TEST_EXCEPTIONS_H */
diff --git a/test/helper/devices/TestPairLeft.cxx b/test/helper/devices/TestPairLeft.h
similarity index 95%
rename from test/helper/devices/TestPairLeft.cxx
rename to test/helper/devices/TestPairLeft.h
index f0045409..3d327b95 100644
--- a/test/helper/devices/TestPairLeft.cxx
+++ b/test/helper/devices/TestPairLeft.h
@@ -6,6 +6,9 @@
  *                  copied verbatim in the file "LICENSE"                       *
  ********************************************************************************/
 
+#ifndef FAIR_MQ_TEST_PAIRLEFT_H
+#define FAIR_MQ_TEST_PAIRLEFT_H
+
 #include <FairMQDevice.h>
 
 #include <cstddef>
@@ -60,3 +63,5 @@ class PairLeft : public FairMQDevice
 } // namespace test
 } // namespace mq
 } // namespace fair
+
+#endif /* FAIR_MQ_TEST_PAIRLEFT_H */
diff --git a/test/helper/devices/TestPairRight.cxx b/test/helper/devices/TestPairRight.h
similarity index 95%
rename from test/helper/devices/TestPairRight.cxx
rename to test/helper/devices/TestPairRight.h
index 73f264ab..149a7491 100644
--- a/test/helper/devices/TestPairRight.cxx
+++ b/test/helper/devices/TestPairRight.h
@@ -6,6 +6,9 @@
  *                  copied verbatim in the file "LICENSE"                       *
  ********************************************************************************/
 
+#ifndef FAIR_MQ_TEST_PAIRRIGHT_H
+#define FAIR_MQ_TEST_PAIRRIGHT_H
+
 #include <FairMQDevice.h>
 #include <cstddef>
 #include <string>
@@ -61,3 +64,5 @@ class PairRight : public FairMQDevice
 } // namespace test
 } // namespace mq
 } // namespace fair
+
+#endif /* FAIR_MQ_TEST_PAIRRIGHT_H */
\ No newline at end of file
diff --git a/test/helper/devices/TestPollIn.cxx b/test/helper/devices/TestPollIn.h
similarity index 97%
rename from test/helper/devices/TestPollIn.cxx
rename to test/helper/devices/TestPollIn.h
index ce0c748a..a683d677 100644
--- a/test/helper/devices/TestPollIn.cxx
+++ b/test/helper/devices/TestPollIn.h
@@ -6,6 +6,9 @@
  *                  copied verbatim in the file "LICENSE"                       *
  ********************************************************************************/
 
+#ifndef FAIR_MQ_TEST_POLLIN_H
+#define FAIR_MQ_TEST_POLLIN_H
+
 #include <FairMQDevice.h>
 #include <FairMQLogger.h>
 #include <options/FairMQProgOptions.h>
@@ -127,3 +130,5 @@ class PollIn : public FairMQDevice
 } // namespace test
 } // namespace mq
 } // namespace fair
+
+#endif /* FAIR_MQ_TEST_POLLIN_H */
diff --git a/test/helper/devices/TestPollOut.cxx b/test/helper/devices/TestPollOut.h
similarity index 91%
rename from test/helper/devices/TestPollOut.cxx
rename to test/helper/devices/TestPollOut.h
index f251230e..4fa57061 100644
--- a/test/helper/devices/TestPollOut.cxx
+++ b/test/helper/devices/TestPollOut.h
@@ -6,6 +6,9 @@
  *                  copied verbatim in the file "LICENSE"                       *
  ********************************************************************************/
 
+#ifndef FAIR_MQ_TEST_POLLOUT_H
+#define FAIR_MQ_TEST_POLLOUT_H
+
 #include <FairMQDevice.h>
 #include <thread>
 
@@ -36,3 +39,5 @@ class PollOut : public FairMQDevice
 } // namespace test
 } // namespace mq
 } // namespace fair
+
+#endif /* FAIR_MQ_TEST_POLLOUT_H */
diff --git a/test/helper/devices/TestPub.cxx b/test/helper/devices/TestPub.h
similarity index 96%
rename from test/helper/devices/TestPub.cxx
rename to test/helper/devices/TestPub.h
index 924f766d..04c939e0 100644
--- a/test/helper/devices/TestPub.cxx
+++ b/test/helper/devices/TestPub.h
@@ -6,6 +6,9 @@
  *                  copied verbatim in the file "LICENSE"                       *
  ********************************************************************************/
 
+#ifndef FAIR_MQ_TEST_PUB_H
+#define FAIR_MQ_TEST_PUB_H
+
 #include <FairMQDevice.h>
 #include <FairMQLogger.h>
 #include <chrono>
@@ -70,3 +73,5 @@ class Pub : public FairMQDevice
 } // namespace test
 } // namespace mq
 } // namespace fair
+
+#endif /* FAIR_MQ_TEST_PUB_H */
diff --git a/test/helper/devices/TestPull.cxx b/test/helper/devices/TestPull.h
similarity index 92%
rename from test/helper/devices/TestPull.cxx
rename to test/helper/devices/TestPull.h
index cbe2ac5b..fef9a10c 100644
--- a/test/helper/devices/TestPull.cxx
+++ b/test/helper/devices/TestPull.h
@@ -6,6 +6,9 @@
  *                  copied verbatim in the file "LICENSE"                       *
  ********************************************************************************/
 
+#ifndef FAIR_MQ_TEST_PULL_H
+#define FAIR_MQ_TEST_PULL_H
+
 #include <FairMQDevice.h>
 #include <FairMQLogger.h>
 #include <thread>
@@ -41,3 +44,5 @@ class Pull : public FairMQDevice
 } // namespace test
 } // namespace mq
 } // namespace fair
+
+#endif /* FAIR_MQ_TEST_PULL_H */
diff --git a/test/helper/devices/TestPush.cxx b/test/helper/devices/TestPush.h
similarity index 91%
rename from test/helper/devices/TestPush.cxx
rename to test/helper/devices/TestPush.h
index a899250e..bb693cbf 100644
--- a/test/helper/devices/TestPush.cxx
+++ b/test/helper/devices/TestPush.h
@@ -6,6 +6,9 @@
  *                  copied verbatim in the file "LICENSE"                       *
  ********************************************************************************/
 
+#ifndef FAIR_MQ_TEST_PUSH_H
+#define FAIR_MQ_TEST_PUSH_H
+
 #include <FairMQDevice.h>
 #include <thread>
 
@@ -34,3 +37,5 @@ class Push : public FairMQDevice
 } // namespace test
 } // namespace mq
 } // namespace fair
+
+#endif /* FAIR_MQ_TEST_PUSH_H */
diff --git a/test/helper/devices/TestRep.cxx b/test/helper/devices/TestRep.h
similarity index 94%
rename from test/helper/devices/TestRep.cxx
rename to test/helper/devices/TestRep.h
index 88d21d49..7e4e73b5 100644
--- a/test/helper/devices/TestRep.cxx
+++ b/test/helper/devices/TestRep.h
@@ -6,6 +6,9 @@
  *                  copied verbatim in the file "LICENSE"                       *
  ********************************************************************************/
 
+#ifndef FAIR_MQ_TEST_REP_H
+#define FAIR_MQ_TEST_REP_H
+
 #include <FairMQDevice.h>
 #include <FairMQLogger.h>
 #include <thread>
@@ -49,3 +52,5 @@ class Rep : public FairMQDevice
 } // namespace test
 } // namespace mq
 } // namespace fair
+
+#endif /* FAIR_MQ_TEST_REP_H */
diff --git a/test/helper/devices/TestReq.cxx b/test/helper/devices/TestReq.h
similarity index 93%
rename from test/helper/devices/TestReq.cxx
rename to test/helper/devices/TestReq.h
index a558dae8..1748793b 100644
--- a/test/helper/devices/TestReq.cxx
+++ b/test/helper/devices/TestReq.h
@@ -6,6 +6,9 @@
  *                  copied verbatim in the file "LICENSE"                       *
  ********************************************************************************/
 
+#ifndef FAIR_MQ_TEST_REQ_H
+#define FAIR_MQ_TEST_REQ_H
+
 #include <FairMQDevice.h>
 #include <FairMQLogger.h>
 #include <thread>
@@ -41,3 +44,5 @@ class Req : public FairMQDevice
 } // namespace test
 } // namespace mq
 } // namespace fair
+
+#endif /* FAIR_MQ_TEST_REQ_H */
diff --git a/test/helper/devices/TestSub.cxx b/test/helper/devices/TestSub.h
similarity index 95%
rename from test/helper/devices/TestSub.cxx
rename to test/helper/devices/TestSub.h
index 121d349d..1e8192eb 100644
--- a/test/helper/devices/TestSub.cxx
+++ b/test/helper/devices/TestSub.h
@@ -6,6 +6,9 @@
  *                  copied verbatim in the file "LICENSE"                       *
  ********************************************************************************/
 
+#ifndef FAIR_MQ_TEST_SUB_H
+#define FAIR_MQ_TEST_SUB_H
+
 #include <FairMQDevice.h>
 #include <FairMQLogger.h>
 #include <chrono>
@@ -64,3 +67,5 @@ class Sub : public FairMQDevice
 } // namespace test
 } // namespace mq
 } // namespace fair
+
+#endif /* FAIR_MQ_TEST_SUB_H */
diff --git a/test/helper/devices/TestTransferTimeout.cxx b/test/helper/devices/TestTransferTimeout.h
similarity index 96%
rename from test/helper/devices/TestTransferTimeout.cxx
rename to test/helper/devices/TestTransferTimeout.h
index d181b189..4d993704 100644
--- a/test/helper/devices/TestTransferTimeout.cxx
+++ b/test/helper/devices/TestTransferTimeout.h
@@ -6,6 +6,9 @@
  *                  copied verbatim in the file "LICENSE"                       *
  ********************************************************************************/
 
+#ifndef FAIR_MQ_TEST_TRANSFERTIMEOUT_H
+#define FAIR_MQ_TEST_TRANSFERTIMEOUT_H
+
 #include <FairMQDevice.h>
 #include <FairMQLogger.h>
 
@@ -112,3 +115,5 @@ class TransferTimeout : public FairMQDevice
 } // namespace test
 } // namespace mq
 } // namespace fair
+
+#endif /* FAIR_MQ_TEST_TRANSFERTIMEOUT_H */
diff --git a/test/helper/devices/TestWaitFor.cxx b/test/helper/devices/TestWaitFor.h
similarity index 90%
rename from test/helper/devices/TestWaitFor.cxx
rename to test/helper/devices/TestWaitFor.h
index 1d6870ef..7059c91a 100644
--- a/test/helper/devices/TestWaitFor.cxx
+++ b/test/helper/devices/TestWaitFor.h
@@ -6,6 +6,9 @@
  *                  copied verbatim in the file "LICENSE"                       *
  ********************************************************************************/
 
+#ifndef FAIR_MQ_TEST_WAITFOR_H
+#define FAIR_MQ_TEST_WAITFOR_H
+
 #include <FairMQDevice.h>
 #include <FairMQLogger.h>
 
@@ -31,3 +34,5 @@ class TestWaitFor : public FairMQDevice
 } // namespace test
 } // namespace mq
 } // namespace fair
+
+#endif /* FAIR_MQ_TEST_WAITFOR_H */
diff --git a/test/helper/runTestDevice.cxx b/test/helper/runTestDevice.cxx
index 4ca6b0b3..23f67714 100644
--- a/test/helper/runTestDevice.cxx
+++ b/test/helper/runTestDevice.cxx
@@ -6,19 +6,19 @@
  *                  copied verbatim in the file "LICENSE"                       *
  ********************************************************************************/
 
-#include "devices/TestPairLeft.cxx"
-#include "devices/TestPairRight.cxx"
-#include "devices/TestPollIn.cxx"
-#include "devices/TestPollOut.cxx"
-#include "devices/TestPub.cxx"
-#include "devices/TestPull.cxx"
-#include "devices/TestPush.cxx"
-#include "devices/TestRep.cxx"
-#include "devices/TestReq.cxx"
-#include "devices/TestSub.cxx"
-#include "devices/TestTransferTimeout.cxx"
-#include "devices/TestWaitFor.cxx"
-#include "devices/TestExceptions.cxx"
+#include "devices/TestPairLeft.h"
+#include "devices/TestPairRight.h"
+#include "devices/TestPollIn.h"
+#include "devices/TestPollOut.h"
+#include "devices/TestPub.h"
+#include "devices/TestPull.h"
+#include "devices/TestPush.h"
+#include "devices/TestRep.h"
+#include "devices/TestReq.h"
+#include "devices/TestSub.h"
+#include "devices/TestTransferTimeout.h"
+#include "devices/TestWaitFor.h"
+#include "devices/TestExceptions.h"
 
 #include <runFairMQDevice.h>
 
@@ -90,7 +90,7 @@ auto getDevice(const FairMQProgOptions& config) -> FairMQDevicePtr
     }
     else if (0 == id.find("exceptions_"))
     {
-        return new TestExceptions;
+        return new Exceptions;
     }
     else
     {