diff --git a/lib/src/phy/ch_estimation/test/CMakeLists.txt b/lib/src/phy/ch_estimation/test/CMakeLists.txt
index 94c3cf030..be5e3b791 100644
--- a/lib/src/phy/ch_estimation/test/CMakeLists.txt
+++ b/lib/src/phy/ch_estimation/test/CMakeLists.txt
@@ -16,10 +16,16 @@ target_link_libraries(chest_test_dl srslte_phy)
 add_test(chest_test_dl_cellid0 chest_test_dl -c 0) 
 add_test(chest_test_dl_cellid1 chest_test_dl -c 1) 
 add_test(chest_test_dl_cellid2 chest_test_dl -c 2) 
+set_tests_properties(chest_test_dl_cellid0 PROPERTIES LABELS "lib;phy")
+set_tests_properties(chest_test_dl_cellid1 PROPERTIES LABELS "lib;phy")
+set_tests_properties(chest_test_dl_cellid2 PROPERTIES LABELS "lib;phy")
 
 add_test(chest_test_dl_cellid0_50prb chest_test_dl -c 0 -r 50)
 add_test(chest_test_dl_cellid1_50prb chest_test_dl -c 1 -r 50)
 add_test(chest_test_dl_cellid2_50prb chest_test_dl -c 2 -r 50)
+set_tests_properties(chest_test_dl_cellid0_50prb PROPERTIES LABELS "lib;phy")
+set_tests_properties(chest_test_dl_cellid1_50prb PROPERTIES LABELS "lib;phy")
+set_tests_properties(chest_test_dl_cellid2_50prb PROPERTIES LABELS "lib;phy")
 
 
 ########################################################################
@@ -34,7 +40,10 @@ target_link_libraries(refsignal_ul_test_all srslte_phy srslte_common)
 
 add_test(chest_test_ul_cellid0 chest_test_ul -c 0 -r 50) 
 add_test(chest_test_ul_cellid1 chest_test_ul -c 1 -r 50) 
-add_test(chest_test_ul_cellid1 chest_test_ul -c 2 -r 50)
+add_test(chest_test_ul_cellid2 chest_test_ul -c 2 -r 50)
+set_tests_properties(chest_test_ul_cellid0 PROPERTIES LABELS "lib;phy")
+set_tests_properties(chest_test_ul_cellid1 PROPERTIES LABELS "lib;phy")
+set_tests_properties(chest_test_ul_cellid2 PROPERTIES LABELS "lib;phy")
 
 ########################################################################
 # Uplink Sounding Reference Signals Channel Estimation TEST
@@ -45,7 +54,7 @@ target_link_libraries(chest_test_srs srslte_phy srslte_common)
 
 foreach (cell_n_prb 6 15 25 50 75 100)
   add_test(chest_test_srs_${cell_n_prb} chest_test_srs -c 2 -r ${cell_n_prb})
-  set_tests_properties(chest_test_srs_${cell_n_prb} PROPERTIES LABELS "long;phy")
+  set_tests_properties(chest_test_srs_${cell_n_prb} PROPERTIES LABELS "lib;long;phy")
 endforeach(cell_n_prb 6 15 25 50 75 100)
 
 
@@ -57,6 +66,7 @@ add_executable(chest_nbiot_test_dl chest_nbiot_test_dl.c)
 target_link_libraries(chest_nbiot_test_dl srslte_phy)
 
 add_test(chest_nbiot_test_dl chest_nbiot_test_dl)
+set_tests_properties(chest_nbiot_test_dl PROPERTIES LABELS "lib;phy")
 
 
 ########################################################################
@@ -67,6 +77,7 @@ add_executable(chest_test_sl chest_test_sl.c)
 target_link_libraries(chest_test_sl srslte_phy)
 
 add_test(chest_test_sl_psbch chest_test_sl)
+set_tests_properties(chest_test_sl_psbch PROPERTIES LABELS "lib;phy")
 
 
 ########################################################################
@@ -77,6 +88,7 @@ add_executable(dmrs_pdsch_test dmrs_pdsch_test.c)
 target_link_libraries(dmrs_pdsch_test srslte_phy)
 
 add_test(dmrs_pdsch_test dmrs_pdsch_test)
+set_tests_properties(dmrs_pdsch_test PROPERTIES LABELS "lib;phy")
 
 
 ########################################################################
@@ -87,6 +99,7 @@ add_executable(dmrs_pdcch_test dmrs_pdcch_test.c)
 target_link_libraries(dmrs_pdcch_test srslte_phy)
 
 add_test(dmrs_pdcch_test dmrs_pdcch_test)
+set_tests_properties(dmrs_pdcch_test PROPERTIES LABELS "lib;phy")
 
 
 ########################################################################
@@ -97,4 +110,5 @@ add_executable(csi_rs_test csi_rs_test.c)
 target_link_libraries(csi_rs_test srslte_phy)
 
 add_test(csi_rs_test csi_rs_test -o 3 -S 0 -L 150 -f 3 -p 15)
+set_tests_properties(csi_rs_test PROPERTIES LABELS "lib;phy")
 
diff --git a/lib/src/phy/fec/ldpc/test/CMakeLists.txt b/lib/src/phy/fec/ldpc/test/CMakeLists.txt
index 2c4e6fc81..61df48210 100644
--- a/lib/src/phy/fec/ldpc/test/CMakeLists.txt
+++ b/lib/src/phy/fec/ldpc/test/CMakeLists.txt
@@ -41,6 +41,7 @@ function(ldpc_unit_tests)
     add_test(NAME ${test_name}-LS${i} COMMAND ${test_command} -l${i}
             WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
             )
+    set_tests_properties(${test_name}-LS${i} PROPERTIES LABELS "lib;nr;phy")
   endforeach()
 endfunction()
 
@@ -72,6 +73,7 @@ set(test_command ldpc_dec_test -b2)
 ldpc_unit_tests(${lifting_sizes})
 
 add_test(NAME LDPC-chain COMMAND ldpc_chain_test)
+set_tests_properties(LDPC-chain PROPERTIES LABELS "lib;nr;phy")
 
 ### Test LDPC Rate Matching UNIT tests
 set(mod_order
@@ -111,22 +113,26 @@ function(ldpc_rm_unit_tests)
           add_test(NAME ${test_name}-b${bgval}-l${i}-e${E}-f10-m${Modval}-r${rvval}-M${N} COMMAND ${test_command} -b${bgval} -l${i} -e${E} -f10 -m${Modval} -r${rvval} -M${N}
                   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
                   )
+          set_tests_properties(${test_name}-b${bgval}-l${i}-e${E}-f10-m${Modval}-r${rvval}-M${N} PROPERTIES LABELS "lib;nr;phy")
           math(EXPR M "${N} / 2")
           # Half size buffer
           add_test(NAME ${test_name}-b${bgval}-l${i}-e${E}-f10-m${Modval}-r${rvval}-M${M} COMMAND ${test_command} -b${bgval} -l${i} -e${E} -f10 -m${Modval} -r${rvval} -M${M}
                   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
                   )
+          set_tests_properties(${test_name}-b${bgval}-l${i}-e${E}-f10-m${Modval}-r${rvval}-M${M} PROPERTIES LABELS "lib;nr;phy")
           math(EXPR Div "2*${Ordval}")
           math(EXPR tmpN "${N} - (${N} % ${Div})")
           math(EXPR E "${Ordval}*(${tmpN})/${Div}") #twice the rate
           add_test(NAME ${test_name}-b${bgval}-l${i}-e${E}-f10-m${Modval}-r${rvval}-M${N} COMMAND ${test_command} -b${bgval} -l${i} -e${E} -f10 -m${Modval} -r${rvval} -M${N}
                   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
                   )
+          set_tests_properties(${test_name}-b${bgval}-l${i}-e${E}-f10-m${Modval}-r${rvval}-M${N} PROPERTIES LABELS "lib;nr;phy")
           math(EXPR M "${N}/ 2")
           # Half size buffer
           add_test(NAME ${test_name}-b${bgval}-l${i}-e${E}-f10-m${Modval}-r${rvval}-M${M} COMMAND ${test_command} -b${bgval} -l${i} -e${E} -f10 -m${Modval} -r${rvval} -M${M}
                   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
                   )
+          set_tests_properties(${test_name}-b${bgval}-l${i}-e${E}-f10-m${Modval}-r${rvval}-M${M} PROPERTIES LABELS "lib;nr;phy")
 
           math(EXPR Div "${Ordval}")
           math(EXPR tmpN "2*${N} - (2*${N} % ${Div})") #Half the rate
@@ -135,11 +141,13 @@ function(ldpc_rm_unit_tests)
 
                   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
                   )
+          set_tests_properties(${test_name}-b${bgval}-l${i}-e${E}-f10-m${Modval}-r${rvval}-M${N} PROPERTIES LABELS "lib;nr;phy")
           math(EXPR M "${N}/ 2")
           # Half size buffer
           add_test(NAME ${test_name}-b${bgval}-l${i}-e${E}-f10-m${Modval}-r${rvval}-M${M} COMMAND ${test_command} -b${bgval} -l${i} -e${E} -f10 -m${Modval} -r${rvval} -M${M}
                   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
                   )
+          set_tests_properties(${test_name}-b${bgval}-l${i}-e${E}-f10-m${Modval}-r${rvval}-M${M} PROPERTIES LABELS "lib;nr;phy")
         endforeach()
       endforeach()
     endforeach()
@@ -151,3 +159,4 @@ set(test_command ldpc_rm_test)
 ldpc_rm_unit_tests(${lifting_sizes})
 
 add_test(NAME LDPC-RM-chain COMMAND ldpc_rm_chain_test -E 1 -B 1)
+set_tests_properties(LDPC-RM-chain PROPERTIES LABELS "lib;nr;phy")
diff --git a/lib/src/phy/fec/polar/test/CMakeLists.txt b/lib/src/phy/fec/polar/test/CMakeLists.txt
index 4d1fbd276..c2430a5e7 100644
--- a/lib/src/phy/fec/polar/test/CMakeLists.txt
+++ b/lib/src/phy/fec/polar/test/CMakeLists.txt
@@ -29,6 +29,7 @@ function(polar_tests_lite)
         add_test(NAME ${test_name}-s${S}-n${nval}-e${eval}-k${kval}-i${ival}
                 COMMAND ${test_command} -s${S} -n${nval} -e${eval} -k${kval} -i${ival}
                 )
+        set_tests_properties(${test_name}-s${S}-n${nval}-e${eval}-k${kval}-i${ival} PROPERTIES LABELS "lib;nr;phy")
     endforeach()
 endfunction()
 
@@ -43,6 +44,7 @@ function(polar_tests)
             add_test(NAME ${test_name}-s${S}-k${Kval}-e${Eval}-n${nval}-i0
                     COMMAND ${test_command} -s${S} -k${Kval} -e${Eval} -n${nval} -i0
                     )
+            set_tests_properties(${test_name}-s${S}-k${Kval}-e${Eval}-n${nval}-i0 PROPERTIES LABELS "lib;nr;phy")
         endforeach()
     endforeach()
 
@@ -55,6 +57,7 @@ function(polar_tests)
             add_test(NAME ${test_name}-s${S}-k${Kval}-e${Eval}-n${nval}-i1
                     COMMAND ${test_command} -s${S} -k${Kval} -e${Eval} -n${nval} -i1
                     )
+            set_tests_properties(${test_name}-s${S}-k${Kval}-e${Eval}-n${nval}-i1 PROPERTIES LABELS "lib;nr;phy")
         endforeach()
     endforeach()
 
@@ -64,6 +67,7 @@ function(polar_tests)
             add_test(NAME ${test_name}-s${S}-k${Kval}-e${Eval}-n${nval}-i1
                     COMMAND ${test_command} -s${S} -k${Kval} -e${Eval} -n${nval} -i1
                     )
+            set_tests_properties(${test_name}-s${S}-k${Kval}-e${Eval}-n${nval}-i1 PROPERTIES LABELS "lib;nr;phy")
         endforeach()
     endforeach()
 
@@ -90,4 +94,5 @@ polar_tests(101)
 # Polar inter-leaver test
 add_executable(polar_interleaver_test polar_interleaver_test.c)
 target_link_libraries(polar_interleaver_test srslte_phy)
-add_test(polar_interleaver_test polar_interleaver_test)
\ No newline at end of file
+add_test(polar_interleaver_test polar_interleaver_test)
+set_tests_properties(polar_interleaver_test PROPERTIES LABELS "lib;nr;phy")
diff --git a/lib/src/phy/fec/turbo/test/CMakeLists.txt b/lib/src/phy/fec/turbo/test/CMakeLists.txt
index 19516aecd..4fddcc65b 100644
--- a/lib/src/phy/fec/turbo/test/CMakeLists.txt
+++ b/lib/src/phy/fec/turbo/test/CMakeLists.txt
@@ -37,3 +37,6 @@ add_test(turbodecoder_test_known turbodecoder_test -n 1 -s 1 -k -e 0.5)
 add_executable(turbocoder_test turbocoder_test.c)
 target_link_libraries(turbocoder_test srslte_phy)
 add_test(turbocoder_test_all turbocoder_test)
+
+set_tests_properties(turbodecoder_test_504_1 turbodecoder_test_504_2 turbodecoder_test_6114_1_5
+                     turbodecoder_test_known turbocoder_test_all PROPERTIES LABELS "lib;phy")
diff --git a/lib/src/phy/phch/test/CMakeLists.txt b/lib/src/phy/phch/test/CMakeLists.txt
index 49b1e355a..7978d68ee 100644
--- a/lib/src/phy/phch/test/CMakeLists.txt
+++ b/lib/src/phy/phch/test/CMakeLists.txt
@@ -92,6 +92,8 @@ add_test(pssch_test_tm2_p50_ext pssch_test -p 50 -m 9 -e)
 add_test(pssch_test_tm2_p75 pssch_test -p 75 -m 17)
 add_test(pssch_test_tm2_p100 pssch_test -p 100 -m 21)
 add_test(pssch_test_tm2_p100_ext pssch_test -p 100 -m 21 -e)
+set_tests_properties(pssch_test_tm2_p6 pssch_test_tm2_p15 pssch_test_tm2_p25 pssch_test_tm2_p50 pssch_test_tm2_p50_ext
+                     pssch_test_tm2_p75 pssch_test_tm2_p100 pssch_test_tm2_p100_ext PROPERTIES LABELS "lib;phy")
 
 # TM4 self tests
 add_test(pssch_test_tm4_p6 pssch_test -p 6 -t 4 -m 2)
@@ -100,6 +102,8 @@ add_test(pssch_test_tm4_p25 pssch_test -p 25 -t 4 -m 7)
 add_test(pssch_test_tm4_p50 pssch_test -p 50 -t 4 -m 9)
 add_test(pssch_test_tm4_p75 pssch_test -p 75 -t 4 -m 17)
 add_test(pssch_test_tm4_p100 pssch_test -p 100 -t 4 -m 21)
+set_tests_properties(pssch_test_tm4_p6 pssch_test_tm4_p15 pssch_test_tm4_p25 pssch_test_tm4_p50 pssch_test_tm4_p75
+                     pssch_test_tm4_p100 PROPERTIES LABELS "lib;phy")
 
 ########################################################################
 # PSCCH AND PSSCH FILE TEST