diff --git a/circle.yml b/circle.yml
index 16a6c817e..3309f55b7 100644
--- a/circle.yml
+++ b/circle.yml
@@ -21,7 +21,7 @@ test:
     - test -z $(gofmt -s -l . | tee /dev/stderr)
     - go vet ./...
     - test -z $(golint ./...          | tee /dev/stderr)
-    - go test -test.v ./...
+    - go test -test.v -test.short ./...
 
     # Disabling the race detector due to massive memory usage.
     # - go test -race -test.v ./...:
diff --git a/storagedriver/testsuites/testsuites.go b/storagedriver/testsuites/testsuites.go
index 1abda7157..3aa8642c2 100644
--- a/storagedriver/testsuites/testsuites.go
+++ b/storagedriver/testsuites/testsuites.go
@@ -213,7 +213,7 @@ func (suite *DriverSuite) TestWriteReadLargeStreams(c *check.C) {
 	defer suite.StorageDriver.Delete(firstPart(filename))
 
 	checksum := sha1.New()
-	var offset int64 = 0
+	var offset int64
 	var chunkSize int64 = 1024 * 1024
 
 	for i := 0; i < 5*1024; i++ {