diff --git a/help.mk b/help.mk
index 1ceef2f30b38fffece14fa10e55776d67c5f3e42..fc43b911487ba6e790aaf67baccaf249315a1d52 100644
--- a/help.mk
+++ b/help.mk
@@ -11,14 +11,17 @@ info:
 	$(info )
 	$(info Dependencies)
 	$(info ------------)
-	$(info [$(HAS_doxygen)] doxygen (doc))
 	$(info [$(HAS_libknot)] libknot (lib))
 	$(info [$(HAS_lua)] lua (daemon))
 	$(info [$(HAS_libuv)] libuv (daemon))
-	$(info [$(HAS_cmocka)] cmocka (tests/unit))
-	$(info [$(HAS_python)] Python (tests/integration))
+	$(info )
+	$(info Optional)
+	$(info --------)
+	$(info [$(HAS_doxygen)] doxygen (doc))
 	$(info [$(HAS_gccgo)] GCCGO (modules/go))
 	$(info [$(HAS_libmemcached)] libmemcached (modules/memcached))
 	$(info [$(HAS_hiredis)] hiredis (modules/redis))
+	$(info [$(HAS_cmocka)] cmocka (tests/unit))
+	$(info [$(HAS_python)] Python (tests/integration))
 	$(info [$(HAS_socket_wrapper)] socket_wrapper (lib))
 	$(info )
diff --git a/tests/integration.mk b/tests/integration.mk
index 685951244fcde8e126cb517827d73182c3130a7c..8f879585975e4b3e4f1fe9990ef3dd92a94696ff 100644
--- a/tests/integration.mk
+++ b/tests/integration.mk
@@ -27,6 +27,6 @@ $(libfaketime): $(libfaketime_DIR)/Makefile
 	@CFLAGS="" $(MAKE) -C $(libfaketime_DIR)
 
 check-integration: $(libfaketime)
-	@$(preload_LIBS) $(preload_syms) tests/test_integration.py $(TESTS) $(abspath daemon/kresd) ./kresd.j2 config
+	@$(preload_LIBS) $(preload_syms) python tests/test_integration.py $(TESTS) $(abspath daemon/kresd) ./kresd.j2 config
 
 .PHONY: check-integration
diff --git a/tests/pydnstest/test.py b/tests/pydnstest/test.py
index 9d47306926c8ccac8c232f9ad2195b65488a09dd..54b94bec7861cd32a8037f218e2950c903d2ee7a 100644
--- a/tests/pydnstest/test.py
+++ b/tests/pydnstest/test.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+import os
+import traceback
 
 class Test:
     """ Small library to imitate CMocka output. """
@@ -26,6 +28,8 @@ class Test:
                 print('[       OK ] %s' % name)
             except Exception as e:
                 print('[     FAIL ] %s (%s)' % (name, str(e)))
+                if 'VERBOSE' in os.environ:
+                    print(traceback.format_exc())
 
         # Clear test set
         self.tests = []
diff --git a/tests/test_integration.py b/tests/test_integration.py
index 8e6f357e03a9ff51b14466f02d9d80fe0f996bb7..f641ba3f7440fa522bec01dbfeeb28d3470f17a9 100755
--- a/tests/test_integration.py
+++ b/tests/test_integration.py
@@ -252,6 +252,7 @@ def play_object(path, binary_name, config_name, j2template, binary_additional_pa
     # Wait until the server accepts TCP clients
     sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
     while True:
+    	time.sleep(0.1)
         if daemon_proc.poll() != None:
             print(open('%s/server.log' % TMPDIR).read())
             raise Exception('process died "%s", logs in "%s"' % (os.path.basename(binary_name), TMPDIR))