diff --git a/crazyflie_groundstation/inc/CCrazyflie.h b/crazyflie_groundstation/inc/CCrazyflie.h
index 8530f364d6bc3a04fd300b184a036cacf757e0bb..f8098107fcc88cb280897f679d15cfa26091e21d 100644
--- a/crazyflie_groundstation/inc/CCrazyflie.h
+++ b/crazyflie_groundstation/inc/CCrazyflie.h
@@ -52,6 +52,7 @@
 #include "serial/serial.h"
 #include "vrpn_Connection.h"
 #include "vrpn_Tracker.h"
+#include "testStand.h"
 
 
 // Ports defined for the CRTP protocol
@@ -298,7 +299,7 @@ class CCrazyflie {
     CTOC *m_tocParameters;
     CTOC *m_tocLogs;
     int testStandError = 0;
-    serial::Serial * test_stand;
+    TestStand testStand;
     bool allowLogging = false;
 
   CCrazyflie(CCrazyRadio *crRadio, int radioChannel, XferRate dataRate, int quadNum, double startTime);