diff --git a/tests/performance/io/CMakeLists.txt b/tests/performance/io/CMakeLists.txt
index 3fb961fcf2b0cc21a2f44d6d895e6c6d39b00cb6..4d4b3a5abd29e3e71e94dd100f84df8ea0b06e7c 100644
--- a/tests/performance/io/CMakeLists.txt
+++ b/tests/performance/io/CMakeLists.txt
@@ -8,10 +8,7 @@ set(DISK_IO_SOURCES
 add_executable(disk_io.exe ${DISK_IO_SOURCES} ${HEADERS})
 
 target_link_libraries(disk_io.exe LINK_PUBLIC nestmc)
-
-if(WITH_TBB)
-    target_link_libraries(disk_io.exe LINK_PUBLIC ${TBB_LIBRARIES})
-endif()
+target_link_libraries(disk_io.exe LINK_PUBLIC ${EXTERNAL_LIBRARIES})
 
 if(WITH_MPI)
     target_link_libraries(disk_io.exe LINK_PUBLIC ${MPI_C_LIBRARIES})
diff --git a/tests/unit/test_mechanisms.cpp b/tests/unit/test_mechanisms.cpp
index 58ffd34efb2152a734124515cb2408d727fd5703..eaf24d7b2fe91ccb441feb17325221e807316534 100644
--- a/tests/unit/test_mechanisms.cpp
+++ b/tests/unit/test_mechanisms.cpp
@@ -52,7 +52,7 @@ TEST(mechanisms, helpers) {
 
 // Setup and update mechanism
 template<typename T>
-void mech_update(T* mech, int num_iters) {
+void mech_update(T* mech, unsigned num_iters) {
 
     using namespace nest::mc;
     std::map<mechanisms::ionKind, mechanisms::ion<typename T::backend>> ions;
@@ -78,11 +78,11 @@ void mech_update(T* mech, int num_iters) {
         }
     }
 
-    for (auto i = 0; i < mech->node_index_.size(); ++i) {
+    for (auto i=0u; i<mech->node_index_.size(); ++i) {
         mech->net_receive(i, 1.);
     }
 
-    for (auto i = 0; i < num_iters; ++i) {
+    for (auto i=0u; i<num_iters; ++i) {
         mech->nrn_current();
         mech->nrn_state();
     }