diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3b44d3a45..87b7a28df 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -107,6 +107,36 @@ test:data-encoding:
     - build
     - build:test
 
+test:p2p-io-scheduler:
+  stage: test
+  tags:
+    - tezos_builder
+  script:
+    - make -C test run-test-p2p-io-scheduler
+  dependencies:
+    - build
+    - build:test
+
+test:p2p-connection:
+  stage: test
+  tags:
+    - tezos_builder
+  script:
+    - make -C test run-test-p2p-connection
+  dependencies:
+    - build
+    - build:test
+
+test:p2p-connection-pool:
+  stage: test
+  tags:
+    - tezos_builder
+  script:
+    - make -C test run-test-p2p-connection-pool
+  dependencies:
+    - build
+    - build:test
+
 expurge:
   stage: expurge
   tags:
diff --git a/scripts/create_docker_builder.sh b/scripts/create_docker_builder.sh
index 1a5592443..c89f6328d 100755
--- a/scripts/create_docker_builder.sh
+++ b/scripts/create_docker_builder.sh
@@ -9,6 +9,8 @@ image_name=${1:=tezos_build}
 ocaml_version=${2:=alpine_ocaml-4.03.0}
 image_version=$3
 
+docker pull ocaml/opam:${ocaml_version}
+
 cp ${cur_dir}/install_build_deps.sh ${dir}
 cp ${cur_dir}/../src/tezos-deps.opam ${dir}
 cat > ${dir}/Dockerfile <<EOF
diff --git a/test/Makefile b/test/Makefile
index 0fe17dcb4..734f8cd4b 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -76,7 +76,7 @@ ${NODELIB} ${CLIENTLIB}:
 .PHONY: build-test run-test test
 build-test: ${addprefix build-test-,${TESTS}}
 run-test:
-	@$(patsubst %,${MAKE} run-test-% ; , ${TESTS}) \
+	@$(patsubst %,${MAKE} run-test-% && , ${TESTS}) \
 	  echo && echo "Success" && echo
 test:
 	@${MAKE} --no-print-directory build-test
@@ -291,6 +291,14 @@ bisect:
 	bisect-ppx-report $(COVERAGESRCDIR) \
           -ignore-missing-files -html reports bisect*.out
 
+#####
+
+lib/assert.cmx: lib/assert.cmi
+lib/assert.cmi: ../src/node/db/persist.cmi
+
+lib/process.cmx: lib/process.cmi
+lib/test.cmx: lib/test.cmi
+
 ############################################################################
 ## Generic rules