diff --git a/.travis.yml b/.travis.yml
index 41aec9bb00..162aa50420 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,9 @@ go:
     - "1.10"
     - "1.11"
     - tip
+arch:
+    - amd64
+    - s390x
 
 go_import_path: github.com/intel/govmm
 
@@ -20,5 +23,3 @@ script:
    - go env
    - $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 f295099cee..d73c34f9a0 100644
--- a/qemu/qemu_arch_base.go
+++ b/qemu/qemu_arch_base.go
@@ -1,4 +1,4 @@
-// +build !s390x,!s390x_test
+// +build !s390x
 
 /*
 // 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 76714a4823..242eb82000 100644
--- a/qemu/qemu_arch_base_test.go
+++ b/qemu/qemu_arch_base_test.go
@@ -1,4 +1,4 @@
-// +build !s390x,!s390x_test
+// +build !s390x
 
 /*
 // Copyright contributors to the Virtual Machine Manager for Go project
diff --git a/qemu/qemus390x.go b/qemu/qemu_s390x.go
similarity index 99%
rename from qemu/qemus390x.go
rename to qemu/qemu_s390x.go
index 0aeffceeb5..6e54f9b719 100644
--- a/qemu/qemus390x.go
+++ b/qemu/qemu_s390x.go
@@ -1,4 +1,4 @@
-// +build s390x s390x_test
+// +build s390x
 
 /*
 // Copyright contributors to the Virtual Machine Manager for Go project
diff --git a/qemu/qemus390x_test.go b/qemu/qemu_s390x_test.go
similarity index 99%
rename from qemu/qemus390x_test.go
rename to qemu/qemu_s390x_test.go
index 6b87d7b40c..a9cc66cc53 100644
--- a/qemu/qemus390x_test.go
+++ b/qemu/qemu_s390x_test.go
@@ -1,4 +1,4 @@
-// +build s390x s390x_test
+// +build s390x
 
 /*
 // Copyright contributors to the Virtual Machine Manager for Go project