diff --git a/.travis.yml b/.travis.yml
index 5bcb7535..7040d0bd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,4 +31,4 @@ script:
     - if [ "$TRAVIS_GLOBAL_WTF" ]; then bash "$DOCKER_PATH/hack/make/validate-dco"; fi
     - if [ "$TRAVIS_GLOBAL_WTF" ]; then bash "$DOCKER_PATH/hack/make/validate-gofmt"; fi
     - if [ -z "$TRAVIS_GLOBAL_WTF" ]; then go build -v ./...; fi
-    - if [ -z "$TRAVIS_GLOBAL_WTF" -a "$GOARCH" != 'arm' ]; then go test -v . ./selinux ./cgroups ./cgroups/fs ./security/capabilities ./syncpipe; fi
+    - if [ -z "$TRAVIS_GLOBAL_WTF" -a "$GOARCH" != 'arm' ]; then go test -test.short -v ./...; fi
diff --git a/netlink/netlink_linux_test.go b/netlink/netlink_linux_test.go
index 92b1273c..ee61d5e2 100644
--- a/netlink/netlink_linux_test.go
+++ b/netlink/netlink_linux_test.go
@@ -6,6 +6,10 @@ import (
 )
 
 func TestCreateBridgeWithMac(t *testing.T) {
+	if testing.Short() {
+		return
+	}
+
 	name := "testbridge"
 
 	if err := CreateBridge(name, true); err != nil {
@@ -28,6 +32,10 @@ func TestCreateBridgeWithMac(t *testing.T) {
 }
 
 func TestCreateVethPair(t *testing.T) {
+	if testing.Short() {
+		return
+	}
+
 	var (
 		name1 = "veth1"
 		name2 = "veth2"