diff --git a/openair1/SIMULATION/CMakeLists.txt b/openair1/SIMULATION/CMakeLists.txt
index 8c9f720abd..9950c85508 100644
--- a/openair1/SIMULATION/CMakeLists.txt
+++ b/openair1/SIMULATION/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: LicenseRef-CSSL-1.0
 
+add_subdirectory(TOOLS)
 if(ENABLE_PHYSIM_TESTS)
   add_subdirectory(tests)
-  add_subdirectory(TOOLS)
 endif()
diff --git a/openair1/SIMULATION/TOOLS/CMakeLists.txt b/openair1/SIMULATION/TOOLS/CMakeLists.txt
index 587220c09f..ebf2430528 100644
--- a/openair1/SIMULATION/TOOLS/CMakeLists.txt
+++ b/openair1/SIMULATION/TOOLS/CMakeLists.txt
@@ -1,5 +1,9 @@
 # SPDX-License-Identifier: LicenseRef-CSSL-1.0
 
+add_library(noise_device noise_device.c)
+target_link_libraries(noise_device PRIVATE log_headers)
+target_include_directories(noise_device PUBLIC ./)
+
 if(CUDA_ENABLE)
     add_library(oai_cuda_lib STATIC
         multipath_channel.cu
diff --git a/radio/vrtsim/noise_device.c b/openair1/SIMULATION/TOOLS/noise_device.c
similarity index 100%
rename from radio/vrtsim/noise_device.c
rename to openair1/SIMULATION/TOOLS/noise_device.c
diff --git a/radio/vrtsim/noise_device.h b/openair1/SIMULATION/TOOLS/noise_device.h
similarity index 100%
rename from radio/vrtsim/noise_device.h
rename to openair1/SIMULATION/TOOLS/noise_device.h
diff --git a/radio/emulator/CMakeLists.txt b/radio/emulator/CMakeLists.txt
index 17a8c1371d..13b75d9e71 100644
--- a/radio/emulator/CMakeLists.txt
+++ b/radio/emulator/CMakeLists.txt
@@ -2,4 +2,4 @@
 
 add_library(rf_emulator MODULE rf_emulator.c)
 set_target_properties(rf_emulator PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
-target_link_libraries(rf_emulator PRIVATE noise_device log_headers)
+target_link_libraries(rf_emulator PRIVATE noise_device log_headers noise_device)
diff --git a/radio/emulator/rf_emulator.c b/radio/emulator/rf_emulator.c
index 34b306c4fe..e838e3ada7 100644
--- a/radio/emulator/rf_emulator.c
+++ b/radio/emulator/rf_emulator.c
@@ -13,7 +13,7 @@
 #include <common/utils/LOG/log.h>
 #include "common/utils/threadPool/pthread_utils.h"
 #include "common_lib.h"
-#include "radio/vrtsim/noise_device.h"
+#include "noise_device.h"
 #include "simde/x86/avx512.h"
 #include "SIMULATION/TOOLS/sim.h"
 
diff --git a/radio/vrtsim/CMakeLists.txt b/radio/vrtsim/CMakeLists.txt
index 80de9de452..64505d83d5 100644
--- a/radio/vrtsim/CMakeLists.txt
+++ b/radio/vrtsim/CMakeLists.txt
@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: LicenseRef-CSSL-1.0
 
-# Noise device static lib
-add_library(noise_device STATIC noise_device.c)
-target_link_libraries(noise_device PRIVATE log_headers)
-
 # vrtsim module
 add_library(vrtsim MODULE
   vrtsim.c