diff --git a/.travis.yml b/.travis.yml
index 23b972a13..00dba89ab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ before_install:
   - ant -q -f $CNG_HOST_PATH/tools/cooja/build.xml jar
 
 script: # The test script for each build.
-  - docker run --privileged -v $CNG_HOST_PATH:/home/user/contiki-ng -ti $DOCKER_IMG bash -c "make -C tests/??-$TEST_NAME";
+  - docker run --privileged -v $CNG_HOST_PATH:/home/user/contiki-ng -ti $DOCKER_IMG bash --login -c "make -C tests/??-$TEST_NAME";
   # Check outcome of the test
   - $CNG_HOST_PATH/tests/check-test.sh $CNG_HOST_PATH/tests/??-$TEST_NAME; exit $?;
 
diff --git a/tests/17-tun-rpl-br/04-border-router-traceroute.sh b/tests/17-tun-rpl-br/04-border-router-traceroute.sh
index 0dba7f835..a150c530f 100755
--- a/tests/17-tun-rpl-br/04-border-router-traceroute.sh
+++ b/tests/17-tun-rpl-br/04-border-router-traceroute.sh
@@ -17,9 +17,6 @@ java -Xshare:on -jar $CONTIKI/tools/cooja/dist/cooja.jar -nogui=$BASENAME.csc -c
 JPID=$!
 sleep 20
 
-echo "Enabling IPv6"
-sudo sysctl -w net.ipv6.conf.all.disable_ipv6=0
-
 # Connect to the simlation
 echo "Starting tunslip6"
 make -C $CONTIKI/tools tunslip6
diff --git a/tests/17-tun-rpl-br/05-native-ping.sh b/tests/17-tun-rpl-br/05-native-ping.sh
index e47536e3f..9e677c16e 100755
--- a/tests/17-tun-rpl-br/05-native-ping.sh
+++ b/tests/17-tun-rpl-br/05-native-ping.sh
@@ -7,9 +7,6 @@ BASENAME=01-native-ping
 
 IPADDR=fd00::302:304:506:708
 
-echo "Enabling IPv6"
-sudo sysctl -w net.ipv6.conf.all.disable_ipv6=0
-
 # Starting Contiki-NG native node
 echo "Starting native node"
 make -C $CONTIKI/examples/hello-world > make.log 2> make.err
diff --git a/tests/17-tun-rpl-br/06-native-coap.sh b/tests/17-tun-rpl-br/06-native-coap.sh
index da5e06a72..16dd8aab7 100755
--- a/tests/17-tun-rpl-br/06-native-coap.sh
+++ b/tests/17-tun-rpl-br/06-native-coap.sh
@@ -10,9 +10,6 @@ IPADDR=fd00::302:304:506:708
 declare -i OKCOUNT=0
 declare -i TESTCOUNT=0
 
-echo "Enabling IPv6"
-sudo sysctl -w net.ipv6.conf.all.disable_ipv6=0
-
 # Starting Contiki-NG native node
 echo "Starting native CoAP server"
 make -C $CONTIKI/examples/coap > make.log 2> make.err
diff --git a/tests/17-tun-rpl-br/test-border-router.sh b/tests/17-tun-rpl-br/test-border-router.sh
index fac803ba8..b8c8f018e 100755
--- a/tests/17-tun-rpl-br/test-border-router.sh
+++ b/tests/17-tun-rpl-br/test-border-router.sh
@@ -18,9 +18,6 @@ java -Xshare:on -jar $CONTIKI/tools/cooja/dist/cooja.jar -nogui=$BASENAME.csc -c
 JPID=$!
 sleep 20
 
-echo "Enabling IPv6"
-sudo sysctl -w net.ipv6.conf.all.disable_ipv6=0
-
 # Connect to the simlation
 echo "Starting tunslip6"
 make -C $CONTIKI/tools tunslip6
diff --git a/tests/17-tun-rpl-br/test-nbr.sh b/tests/17-tun-rpl-br/test-nbr.sh
index 63862a656..9a1824f7c 100644
--- a/tests/17-tun-rpl-br/test-nbr.sh
+++ b/tests/17-tun-rpl-br/test-nbr.sh
@@ -18,9 +18,6 @@ java -Xshare:on -jar $CONTIKI/tools/cooja/dist/cooja.jar -nogui=$BASENAME.csc -c
 JPID=$!
 sleep 20
 
-echo "Enabling IPv6"
-sudo sysctl -w net.ipv6.conf.all.disable_ipv6=0
-
 # Connect to the simlation
 echo "Starting native border-router"
 nohup make -C $CONTIKI/examples/rpl-border-router/ connect-router-cooja TARGET=native >> $BASENAME.nbr.log 2>&1 &
diff --git a/tests/18-coap-lwm2m/06-lwm2m-ipso-test.sh b/tests/18-coap-lwm2m/06-lwm2m-ipso-test.sh
index 537d7a15e..15fd96243 100755
--- a/tests/18-coap-lwm2m/06-lwm2m-ipso-test.sh
+++ b/tests/18-coap-lwm2m/06-lwm2m-ipso-test.sh
@@ -7,9 +7,6 @@ BASENAME=06-lwm2m-test
 
 IPADDR=fd00::302:304:506:708
 
-echo "Enabling IPv6"
-sudo sysctl -w net.ipv6.conf.all.disable_ipv6=0
-
 # Starting Contiki-NG native node
 echo "Starting native node - lwm2m/ipso objects"
 make -C $CONTIKI/examples/ipso-objects > make.log 2> make.err
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 14c1636ae..d8e9c0a79 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -67,24 +67,24 @@ WORKDIR                 ${HOME}
 RUN echo "#!/bin/bash\nant -Dbasedir=${COOJA} -f ${COOJA}/build.xml run" > ${HOME}/cooja && \
   chmod +x ${HOME}/cooja
 
-# Optional: download Contiki-NG and pre-compile Cooja.
-# Else, use a Docker bind mount to share the repo with the host.
-# Docker run option:
-# -v <HOST_CONTIKI_NG_ABS_PATH>:/home/user/contiki-ng
-#RUN git clone --recursive https://github.com/contiki-ng/contiki-ng.git ${CONTIKI_NG}
-#RUN ant -q -f ${CONTIKI_NG}/tools/cooja/build.xml jar
-
-# Enable IPv6 -- must be done at runtime, not in Dockerfile
-#RUN sudo sysctl -w net.ipv6.conf.all.disable_ipv6=0
-
 # Install coap-cli
 RUN sudo apt-get install -y npm \
   && sudo apt-get clean \
   && sudo npm install coap-cli -g \
   && sudo ln -s /usr/bin/nodejs /usr/bin/node
 
+# Optional: download Contiki-NG and pre-compile Cooja.
+# Else, use a Docker bind mount to share the repo with the host.
+# Docker run option:
+# -v <HOST_CONTIKI_NG_ABS_PATH>:/home/user/contiki-ng
+RUN git clone --recursive https://github.com/contiki-ng/contiki-ng.git ${CONTIKI_NG}
+RUN ant -q -f ${CONTIKI_NG}/tools/cooja/build.xml jar
+
 # Working directory
 WORKDIR ${CONTIKI_NG}
 
+# Enable IPv6 -- must be done at runtime, not in Dockerfile
+RUN echo "sudo sysctl -w net.ipv6.conf.all.disable_ipv6=0 > /dev/null" >> /home/user/.profile
+
 # Start a bash
-CMD bash
+CMD bash --login