diff --git a/circle.yml b/circle.yml
index d8e996d70..e43ecb66d 100644
--- a/circle.yml
+++ b/circle.yml
@@ -102,8 +102,7 @@ test:
     - echo "$CIRCLE_PAIN" > ~/goverage.report
     - gvm use stable; go list ./... | xargs -L 1 -I{} rm -f $GOPATH/src/{}/coverage.out:
         pwd: $BASE_STABLE
-
-    - gvm use stable; go list ./... | xargs -L 1 -I{} godep go test -tags "$DOCKER_BUILDTAGS" -test.short -coverprofile=$GOPATH/src/{}/coverage.out {}:
+    - gvm use stable; go list -tags "$DOCKER_BUILDTAGS" ./... | xargs -L 1 -I{} godep go test -tags "$DOCKER_BUILDTAGS" -test.short -coverprofile=$GOPATH/src/{}/coverage.out {}:
         timeout: 600
         pwd: $BASE_STABLE
 
diff --git a/registry/storage/driver/rados/doc.go b/registry/storage/driver/rados/doc.go
new file mode 100644
index 000000000..655c68a33
--- /dev/null
+++ b/registry/storage/driver/rados/doc.go
@@ -0,0 +1,3 @@
+// Package rados implements the rados storage driver backend. Support can be
+// enabled by including the "include_rados" build tag.
+package rados
diff --git a/registry/storage/driver/rados/rados.go b/registry/storage/driver/rados/rados.go
index 9bac8fc32..0ea10a895 100644
--- a/registry/storage/driver/rados/rados.go
+++ b/registry/storage/driver/rados/rados.go
@@ -1,3 +1,5 @@
+// +build include_rados
+
 package rados
 
 import (
diff --git a/registry/storage/driver/rados/rados_test.go b/registry/storage/driver/rados/rados_test.go
index 29486e896..d408519ba 100644
--- a/registry/storage/driver/rados/rados_test.go
+++ b/registry/storage/driver/rados/rados_test.go
@@ -1,3 +1,5 @@
+// +build include_rados
+
 package rados
 
 import (