diff --git a/.travis.yml b/.travis.yml
index 1cfe2ef036..b8eaf3eb6f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,3 +21,4 @@ script:
    - $GOPATH/bin/goveralls -v -service=travis-ci
    - gometalinter --tests --vendor --disable-all --enable=misspell --enable=vet --enable=ineffassign --enable=gofmt --enable=gocyclo --cyclo-over=15 --enable=golint --enable=errcheck --enable=deadcode --enable=staticcheck -enable=gas ./...
    - GOARCH=s390x go install ./...
+   - go test --tags s390x_test ./...
diff --git a/qemu/qemu_arch_base.go b/qemu/qemu_arch_base.go
index 5e293d1d62..521741fa6a 100644
--- a/qemu/qemu_arch_base.go
+++ b/qemu/qemu_arch_base.go
@@ -1,4 +1,4 @@
-// +build !s390x
+// +build !s390x,!s390x_test
 
 /*
 // Copyright contributors to the Virtual Machine Manager for Go project
diff --git a/qemu/qemu_arch_base_test.go b/qemu/qemu_arch_base_test.go
index 64a8415b49..93eac3ee56 100644
--- a/qemu/qemu_arch_base_test.go
+++ b/qemu/qemu_arch_base_test.go
@@ -1,4 +1,4 @@
-// +build !s390x
+// +build !s390x,!s390x_test
 
 /*
 // Copyright contributors to the Virtual Machine Manager for Go project
diff --git a/qemu/qemu_s390x.go b/qemu/qemus390x.go
similarity index 99%
rename from qemu/qemu_s390x.go
rename to qemu/qemus390x.go
index d8395837fc..7c45c3edd9 100644
--- a/qemu/qemu_s390x.go
+++ b/qemu/qemus390x.go
@@ -1,4 +1,4 @@
-// +build s390x
+// +build s390x s390x_test
 
 /*
 // Copyright contributors to the Virtual Machine Manager for Go project
diff --git a/qemu/qemu_s390x_test.go b/qemu/qemus390x_test.go
similarity index 99%
rename from qemu/qemu_s390x_test.go
rename to qemu/qemus390x_test.go
index b76af3ced5..1aac28434e 100644
--- a/qemu/qemu_s390x_test.go
+++ b/qemu/qemus390x_test.go
@@ -1,4 +1,4 @@
-// +build s390x
+// +build s390x s390x_test
 
 /*
 // Copyright contributors to the Virtual Machine Manager for Go project