diff --git a/circle.yml b/circle.yml
index b2bacf4641c6511bf28c775beba3082d12fa6381..dc1152dd5325ac64e2cde65e75507cf76bbd48b0 100644
--- a/circle.yml
+++ b/circle.yml
@@ -42,9 +42,9 @@ test:
   override:
     # We only wish to test our packages not vendored ones
     - echo "Running unit tests..."
-    - cd $GOPATH_REPO && glide novendor | xargs go test -v
+    - cd $GOPATH_REPO && go test -v `glide novendor`
     - echo "Running integration tests..."
-    - cd $GOPATH_REPO && glide novendor | xargs go test -v -tags integration
+    - cd $GOPATH_REPO && go test -v -tags integration `glide novendor`
 
 
 deployment:
diff --git a/rpc/tendermint/test/common.go b/rpc/tendermint/test/common.go
index 81832215a3fec3adc6293091bc16a6e7fc1f5399..211d3549991fccb6d68a0754f254609311a0591a 100644
--- a/rpc/tendermint/test/common.go
+++ b/rpc/tendermint/test/common.go
@@ -1,13 +1,18 @@
+// +build integration
+
+// Space above here matters
 package test
 
 import (
 	"github.com/eris-ltd/eris-db/test/fixtures"
 	rpc_core "github.com/eris-ltd/eris-db/rpc/tendermint/core"
 	"testing"
+	"fmt"
 )
 
-// Needs to be in a _test.go file to be picked up
+// Needs to be referenced by a *_test.go file to be picked up
 func TestWrapper(runner func() int) int {
+	fmt.Println("Running with integration TestWrapper (rpc/tendermint/test/common.go)...")
 	ffs := fixtures.NewFileFixtures("Eris-DB")
 
 	defer ffs.RemoveAll()
diff --git a/rpc/tendermint/test/runner/main.go b/rpc/tendermint/test/runner/main.go
index 0c7fe65645ee20f1266b82b25ac296e9ed204bee..a6836357833531d32e6218ff5001b58adb37505e 100644
--- a/rpc/tendermint/test/runner/main.go
+++ b/rpc/tendermint/test/runner/main.go
@@ -1,3 +1,6 @@
+// +build integration
+
+// Space above here matters
 package main
 
 import (