diff --git a/.travis.yml b/.travis.yml
index 1bd69da347..ab0f435cd4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,8 @@ go_import_path: github.com/ethereum/go-ethereum
 sudo: false
 matrix:
   include:
-    - os: linux
+    - if: env(PROJECT) = ethereum
+      os: linux
       dist: trusty
       sudo: required
       go: 1.7.x
@@ -15,7 +16,8 @@ matrix:
         - go run build/ci.go install
         - go run build/ci.go test -coverage
 
-    - os: linux
+    - if: env(PROJECT) = ethereum
+      os: linux
       dist: trusty
       sudo: required
       go: 1.8.x
@@ -28,7 +30,8 @@ matrix:
         - go run build/ci.go test -coverage
 
     # These are the latest Go versions.
-    - os: linux
+    - if: env(PROJECT) = ethereum
+      os: linux
       dist: trusty
       sudo: required
       go: 1.9.x
@@ -51,7 +54,8 @@ matrix:
         - go run build/ci.go test -coverage
 
     # This builder only tests code linters on latest version of Go
-    - os: linux
+    - if: env(PROJECT) = ethereum
+      os: linux
       dist: trusty
       sudo: required
       go: 1.9.x
@@ -65,7 +69,8 @@ matrix:
         - go run build/ci.go lint
 
     # This builder does the Ubuntu PPA and Linux Azure uploads
-    - os: linux
+    - if: env(PROJECT) = ethereum
+      os: linux
       dist: trusty
       sudo: required
       go: 1.9.x
@@ -102,7 +107,8 @@ matrix:
         - go run build/ci.go archive -arch arm64 -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
 
     # This builder does the Linux Azure MIPS xgo uploads
-    - os: linux
+    - if: env(PROJECT) = ethereum
+      os: linux
       dist: trusty
       sudo: required
       services:
@@ -128,7 +134,8 @@ matrix:
         - go run build/ci.go archive -arch mips64le -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
 
     # This builder does the Android Maven and Azure uploads
-    - os: linux
+    - if: env(PROJECT) = ethereum
+      os: linux
       dist: precise # Needed for the android tools
       addons:
         apt:
@@ -187,7 +194,8 @@ matrix:
         - go run build/ci.go xcode -signer IOS_SIGNING_KEY -deploy trunk -upload gethstore/builds
 
     # This builder does the Azure archive purges to avoid accumulating junk
-    - os: linux
+    - if: env(PROJECT) = ethereum
+      os: linux
       dist: trusty
       sudo: required
       go: 1.9.x
@@ -196,6 +204,20 @@ matrix:
       script:
         - go run build/ci.go purge -store gethstore/builds -days 14
 
+    # These are the latest Go versions.
+    - if: env(PROJECT) = swarm
+      os: linux
+      dist: trusty
+      sudo: required
+      go: 1.9.x
+      script:
+        - sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install fuse
+        - sudo modprobe fuse
+        - sudo chmod 666 /dev/fuse
+        - sudo chown root:$USER /etc/fuse.conf
+        - go run build/ci.go install
+        - go run build/ci.go test -coverage
+
 install:
   - go get golang.org/x/tools/cmd/cover
 script:
diff --git a/test b/test
deleted file mode 100644
index e69de29bb2..0000000000