diff --git a/source/tests/CarlaUtils1.cpp b/source/tests/CarlaUtils1.cpp
index ef7a85f6b..87281473f 100644
--- a/source/tests/CarlaUtils1.cpp
+++ b/source/tests/CarlaUtils1.cpp
@@ -459,8 +459,9 @@ static void test_CarlaBackendUtils() noexcept
 
 static void test_CarlaBridgeUtils() noexcept
 {
-    carla_stdout(PluginBridgeInfoType2str(kPluginBridgePong));
-    carla_stdout(PluginBridgeOpcode2str(kPluginBridgeOpcodeNull));
+    carla_stdout(PluginBridgeOscInfoType2str(kPluginBridgeOscPong));
+    carla_stdout(PluginBridgeRtOpcode2str(kPluginBridgeRtNull));
+    carla_stdout(PluginBridgeNonRtOpcode2str(kPluginBridgeNonRtNull));
 }
 
 // -----------------------------------------------------------------------
diff --git a/source/tests/CarlaUtils2.cpp b/source/tests/CarlaUtils2.cpp
index dd0c761ef..a5484f794 100644
--- a/source/tests/CarlaUtils2.cpp
+++ b/source/tests/CarlaUtils2.cpp
@@ -21,22 +21,11 @@
 
 #define VESTIGE_HEADER
 
-#include "CarlaUtils.hpp"
-
-#undef NULL
-#define NULL nullptr
-
 #include "CarlaLadspaUtils.hpp"
 #include "CarlaDssiUtils.cpp"
 #include "CarlaLv2Utils.hpp"
 #include "CarlaVstUtils.hpp"
 
-// used in dssi utils
-#include "juce_core.h"
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QStringList>
-
 // -----------------------------------------------------------------------
 
 static void test_CarlaLadspaUtils()
diff --git a/source/tests/Makefile b/source/tests/Makefile
index 891d61fe6..84f573b65 100644
--- a/source/tests/Makefile
+++ b/source/tests/Makefile
@@ -28,9 +28,9 @@ GNU_CXX_FLAGS += -std=c++11 -std=gnu++11 -Weffc++ -Wzero-as-null-pointer-constan
 # --------------------------------------------------------------
 
 PEDANTIC_CXX_FLAGS  = $(BASE_FLAGS)
-PEDANTIC_CXX_FLAGS += -std=c++11 -pedantic -pedantic-errors -Weffc++
+PEDANTIC_CXX_FLAGS += -std=c++11 -pedantic -pedantic-errors
 PEDANTIC_CXX_FLAGS += -isystem /opt/kxstudio/include
-PEDANTIC_CXX_FLAGS += -Wno-vla -Wno-vla-extension
+PEDANTIC_CXX_FLAGS += -Weffc++ -Wno-vla
 ifeq ($(CC),clang-3.4)
 PEDANTIC_CXX_FLAGS += -Wno-vla-extension
 else
@@ -79,8 +79,7 @@ CarlaUtils1: CarlaUtils1.cpp ../utils/*.hpp
 
 CarlaUtils2: CarlaUtils2.cpp ../utils/*.hpp
 	$(CXX) $< $(PEDANTIC_CXX_FLAGS) -o $@ \
-		 ../modules/juce_core.a ../modules/lilv.a -ldl -lpthread -lrt \
-		 $(shell pkg-config --cflags --libs QtCore) -isystem /usr/include/qt4
+		 ../modules/juce_core.a ../modules/lilv.a -ldl -lpthread -lrt
 	valgrind --leak-check=full ./$@
 
 CarlaUtils3: CarlaUtils3.cpp ../utils/*.hpp
@@ -89,8 +88,7 @@ CarlaUtils3: CarlaUtils3.cpp ../utils/*.hpp
 
 CarlaUtils4: CarlaUtils4.cpp ../utils/CarlaStateUtils.cpp ../utils/*.hpp
 	$(CXX) $< $(PEDANTIC_CXX_FLAGS) -o $@ \
-		../modules/juce_core.a -ldl -lpthread -lrt \
-		$(shell pkg-config --cflags --libs QtCore) -isystem /usr/include/qt4
+		../modules/juce_core.a -ldl -lpthread -lrt
 	valgrind --leak-check=full ./$@
 
 Exceptions: Exceptions.cpp
diff --git a/source/utils/CarlaLv2Utils.hpp b/source/utils/CarlaLv2Utils.hpp
index 4daff2070..373fdc7b5 100644
--- a/source/utils/CarlaLv2Utils.hpp
+++ b/source/utils/CarlaLv2Utils.hpp
@@ -20,6 +20,9 @@
 
 #include "CarlaUtils.hpp"
 
+#undef NULL
+#define NULL nullptr
+
 #include "lv2/lv2.h"
 #include "lv2/atom.h"
 #include "lv2/atom-forge.h"