diff --git a/docker/main/Dockerfile b/docker/main/Dockerfile
index 6662f095..08a74250 100644
--- a/docker/main/Dockerfile
+++ b/docker/main/Dockerfile
@@ -90,7 +90,7 @@ RUN install startsystem.sh /clixon/build/bin/
 
 #
 # Stage 2
-#
+# The second step skips the development environment and builds a runtime system
 FROM alpine
 MAINTAINER Olof Hagsand <olof@hagsand.se>
 
diff --git a/docker/main/startsystem.sh b/docker/main/startsystem.sh
index bf2d9d25..55f26eb4 100755
--- a/docker/main/startsystem.sh
+++ b/docker/main/startsystem.sh
@@ -86,7 +86,7 @@ EOF
 # - test_order.sh XXX this is a bug need debugging
 cat <<EOF > /usr/local/bin/test/site.sh
 # Add your local site specific env variables (or tests) here.
-SKIPLIST="test_api.sh test_yangmodels.sh test_openconfig.sh test_install.sh test_privileges.sh"
+SKIPLIST="test_api.sh test_c++.sh test_yangmodels.sh test_openconfig.sh test_install.sh test_privileges.sh"
 #IETFRFC=
 EOF
 
diff --git a/test/cicd/Makefile.in b/test/cicd/Makefile.in
index c4b97269..16a63d1a 100644
--- a/test/cicd/Makefile.in
+++ b/test/cicd/Makefile.in
@@ -48,9 +48,9 @@ SHELL	= /bin/sh
 HOSTS=
 -include site.mk
 
-.PHONY: all clean distclean depend install uninstall $(HOSTS) $(VAGRANTS)
+.PHONY: all clean distclean depend install uninstall $(HOSTS)
 
-all: $(HOSTS) $(VAGRANTS)
+all: $(HOSTS)
 
 # Real hosts reachable by ssh
 $(HOSTS):