diff --git a/.gitignore b/.gitignore
index 6c7bbfdce..98d69b3f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,15 +70,13 @@ data/windows/Carla
 data/windows/CarlaControl
 source/plugin/carla-native.lv2/*.ttl
 source/tests/ansi-pedantic-test_*
-source/tests/ANSI
 source/tests/CarlaString
-source/tests/DGL1
-source/tests/DGL2
+source/tests/EngineEvents
+source/tests/PipeServer
 source/tests/Print
 source/tests/RtLinkedList
 source/tests/RtLinkedListGnu
 source/tests/Utils
-source/tests/Widgets
 
 # Docs
 doc/CarlaBackend/
diff --git a/source/tests/Misc.cpp b/source/tests/EngineEvents.cpp
similarity index 100%
rename from source/tests/Misc.cpp
rename to source/tests/EngineEvents.cpp
diff --git a/source/tests/Makefile b/source/tests/Makefile
index 61411835b..788ec5f53 100644
--- a/source/tests/Makefile
+++ b/source/tests/Makefile
@@ -34,7 +34,7 @@ PEDANTIC_CXX_FLAGS += -isystem /opt/kxstudio/include
 # --------------------------------------------------------------
 
 TARGETS  = ansi-pedantic-test_c ansi-pedantic-test_c99 ansi-pedantic-test_cxx ansi-pedantic-test_cxx11
-TARGETS += CarlaString PipeServer Print RtLinkedList RtLinkedListGnu Utils
+TARGETS += CarlaString EngineEvents PipeServer Print RtLinkedList RtLinkedListGnu Utils
 
 all: $(TARGETS)
 
@@ -58,14 +58,14 @@ CarlaString: CarlaString.cpp ../utils/CarlaString.hpp
 	$(CXX) $< $(PEDANTIC_CXX_FLAGS) -o $@
 	valgrind ./$@
 
+EngineEvents: EngineEvents.cpp
+	$(CXX) $< $(PEDANTIC_CXX_FLAGS) -L../backend -lcarla_standalone2 -o $@
+	env LD_LIBRARY_PATH=../backend valgrind ./$@
+
 PipeServer: PipeServer.cpp ../utils/CarlaPipeUtils.hpp
 	$(CXX) $< $(PEDANTIC_CXX_FLAGS) -o $@
 # 	valgrind ./$@
 
-Misc: Misc.cpp
-	$(CXX) $< $(PEDANTIC_CXX_FLAGS) -L../backend -lcarla_standalone2 -o $@
-	env LD_LIBRARY_PATH=../backend valgrind ./$@
-
 Print: Print.cpp ../utils/CarlaUtils.hpp
 	$(CXX) $< $(PEDANTIC_CXX_FLAGS) -o $@
 	valgrind ./$@