diff --git a/lib/test/upper/CMakeLists.txt b/lib/test/upper/CMakeLists.txt
index 79bbb8331..b5d49f71d 100644
--- a/lib/test/upper/CMakeLists.txt
+++ b/lib/test/upper/CMakeLists.txt
@@ -30,9 +30,10 @@ add_executable(rlc_am_test rlc_am_test.cc)
 target_link_libraries(rlc_am_test srslte_upper srslte_phy srslte_common)
 add_test(rlc_am_test rlc_am_test)
 
-add_executable(rlc_am_stress_test rlc_am_stress_test.cc)
-target_link_libraries(rlc_am_stress_test srslte_upper srslte_phy srslte_common ${Boost_LIBRARIES})
-add_test(rlc_am_stress_test rlc_am_stress_test --duration 10)
+add_executable(rlc_stress_test rlc_stress_test.cc)
+target_link_libraries(rlc_stress_test srslte_upper srslte_phy srslte_common ${Boost_LIBRARIES})
+add_test(rlc_am_stress_test rlc_stress_test --duration 10 --mode="AM")
+add_test(rlc_um_stress_test rlc_stress_test --duration 10 --mode="UM")
 
 add_executable(rlc_um_data_test rlc_um_data_test.cc)
 target_link_libraries(rlc_um_data_test srslte_upper srslte_phy srslte_common)
diff --git a/lib/test/upper/rlc_am_stress_test.cc b/lib/test/upper/rlc_stress_test.cc
similarity index 100%
rename from lib/test/upper/rlc_am_stress_test.cc
rename to lib/test/upper/rlc_stress_test.cc