diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 09e6b0327..dc3b335a6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -81,8 +81,10 @@ build:packages:
 
 test:coverage:
   stage: test
+  variables:
+    COVERAGE: "1"
   script:
-    - make coverage COVERAGE=1
+    - make coverage
   artifacts:
     name: "${CI_PROJECT_NAME}-coverage-${CI_BUILD_REF}"
     paths:
@@ -121,6 +123,8 @@ test:integration:
 
 test:valgrind:
   stage: test
+  variables:
+    DEBUG: "1"
   script:
     - make run-valgrind
   dependencies:
diff --git a/tests/Makefile.inc b/tests/Makefile.inc
index 8ad1f1344..e711077d0 100644
--- a/tests/Makefile.inc
+++ b/tests/Makefile.inc
@@ -30,7 +30,7 @@ run-tests: run-unit-tests run-integration-tests run-valgrind
 VALGRIND = valgrind --leak-check=full --show-leak-kinds=all --suppressions=$(SRCDIR)/tests/valgrind.supp
 
 run-valgrind: src
-	$(VALGRIND) $(BUILDDIR)/villas-node & sleep 1; kill %1
+	$(VALGRIND) $(BUILDDIR)/villas-node & sleep 2; kill %1
 	$(VALGRIND) $(BUILDDIR)/villas-pipe -t 1 $(SRCDIR)/etc/websocket-loopback.conf ws1
 
 .PHONY: tests run-tests run-valgrind