diff --git a/Makefile.in b/Makefile.in
index ac14dc51..5d4a72f3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -144,7 +144,7 @@ example:
 # Run a clixon test container.
 # Alt: cd test; ./all.sh
 test:
-	(cd docker/system && $(MAKE) $(MFLAGS) test)
+	(cd docker && $(MAKE) $(MFLAGS) test)
 
 docker:
 	for i in docker; \
diff --git a/docker/Makefile.in b/docker/Makefile.in
index ce1c8e60..b7711d98 100644
--- a/docker/Makefile.in
+++ b/docker/Makefile.in
@@ -44,7 +44,7 @@ SUBDIRS  = base
 SUBDIRS  += system
 #SUBDIRS += cluster
 
-.PHONY: all clean distclean depend install-include install uninstall
+.PHONY: all clean distclean depend install-include install uninstall test
 
 all:	$(SUBDIRS)
 
@@ -53,6 +53,9 @@ clean:
 distclean: clean
 	rm -f Makefile *~ .depend
 
+test:
+	(cd system && $(MAKE) $(MFLAGS) test)
+
 depend:
 
 install-include:
diff --git a/docker/README.md b/docker/README.md
index f5d2ffca..01f4d21a 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,4 +1,4 @@
-# Clixon and dockers
+# Clixon container images
 
 This directory contains sub-directories with examples of Clixon docker images:
 
diff --git a/test/travis/before_script.sh b/test/travis/before_script.sh
index 149a0705..4f20b52e 100755
--- a/test/travis/before_script.sh
+++ b/test/travis/before_script.sh
@@ -1,14 +1,5 @@
 #!/bin/sh
 # Travis pre-config script.
-# Clone and install CLIgen
+# Clone and install CLIgen (needed for clixon configure and make)
 git clone https://github.com/olofhagsand/cligen.git
 (cd cligen && ./configure && make && sudo make install)
-#./configure && make && sudo make install
-#sudo /sbin/ldconfig
-#sudo make install-include
-#(cd example && make && sudo make install)
-#sudo groupadd clicon
-#sudo usermod -a -G clicon $(whoami)
-#sudo usermod -a -G clicon www-data
-# Build the system docker container (make test may trigger it)
-(cd docker/system && make docker)