diff --git a/lib/test/upper/pdcp_base_test.h b/lib/test/upper/pdcp_base_test.h
index 99e747a80..8d18ee40a 100644
--- a/lib/test/upper/pdcp_base_test.h
+++ b/lib/test/upper/pdcp_base_test.h
@@ -25,20 +25,10 @@
 #include "srslte/common/buffer_pool.h"
 #include "srslte/common/log_filter.h"
 #include "srslte/common/security.h"
+#include "srslte/common/test_common.h"
 #include "srslte/interfaces/ue_interfaces.h"
 #include <iostream>
 
-/*
- * Functions and macros for comparisions
- */
-#define TESTASSERT(cond)                                                                                               \
-  {                                                                                                                    \
-    if (!(cond)) {                                                                                                     \
-      std::cout << "[" << __FUNCTION__ << "][Line " << __LINE__ << "]: FAIL at " << (#cond) << std::endl;              \
-      return -1;                                                                                                       \
-    }                                                                                                                  \
-  }
-
 int compare_two_packets(const srslte::unique_byte_buffer_t& msg1, const srslte::unique_byte_buffer_t& msg2)
 {
   TESTASSERT(msg1->N_bytes == msg2->N_bytes);
diff --git a/lib/test/upper/pdcp_lte_test.h b/lib/test/upper/pdcp_lte_test.h
index 66eb1858e..a1509fa71 100644
--- a/lib/test/upper/pdcp_lte_test.h
+++ b/lib/test/upper/pdcp_lte_test.h
@@ -88,7 +88,6 @@ public:
 
   void set_pdcp_initial_state(pdcp_lte_initial_state init_state)
   {
-
     pdcp.set_tx_count(init_state.tx_count);
     pdcp.set_rx_hfn(init_state.rx_hfn);
     pdcp.set_next_pdcp_rx_sn(init_state.next_pdcp_rx_sn);
diff --git a/lib/test/upper/pdcp_lte_test_rx.cc b/lib/test/upper/pdcp_lte_test_rx.cc
index e2decfaa6..40a0a4d10 100644
--- a/lib/test/upper/pdcp_lte_test_rx.cc
+++ b/lib/test/upper/pdcp_lte_test_rx.cc
@@ -34,7 +34,6 @@ int test_rx(std::vector<pdcp_test_event_t>      events,
             srslte::log*                        log)
 
 {
-
   srslte::pdcp_config_t cfg_rx = {1,
                                   rb_type,
                                   srslte::SECURITY_DIRECTION_DOWNLINK,