diff --git a/.travis.yml b/.travis.yml
index f4a3caf..60fddb2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,9 +16,9 @@ jdk:
 script:
   - if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ]; then
       if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
-        make native-all && sbt ++$TRAVIS_SCALA_VERSION "; test; publish";
+        sbt ++$TRAVIS_SCALA_VERSION "; test; publish";
       else
-        make linux64 && sbt ++$TRAVIS_SCALA_VERSION test;
+        sbt ++$TRAVIS_SCALA_VERSION test;
       fi;
     else
       sbt ++$TRAVIS_SCALA_VERSION test;
diff --git a/Makefile b/Makefile
index f99807c..61e18bd 100644
--- a/Makefile
+++ b/Makefile
@@ -146,7 +146,7 @@ $(TARGET)/$(snappy-jar-version).jar:
 test: $(NATIVE_DLL)
 	$(SBT) test
 
-DOCKER_RUN_OPTS=--privileged
+DOCKER_RUN_OPTS=--rm
 
 win32: jni-header
 	./docker/dockcross-windows-x86 -a $(DOCKER_RUN_OPTS) bash -c 'make clean-native native CROSS_PREFIX=i686-w64-mingw32.static- OS_NAME=Windows OS_ARCH=x86'