diff --git a/cmd/registry-storagedriver-azure/main.go b/cmd/registry-storagedriver-azure/main.go
index b99443428..584699bf6 100644
--- a/cmd/registry-storagedriver-azure/main.go
+++ b/cmd/registry-storagedriver-azure/main.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package main
 
 import (
diff --git a/cmd/registry-storagedriver-filesystem/main.go b/cmd/registry-storagedriver-filesystem/main.go
index 5ea1eb706..0e555b610 100644
--- a/cmd/registry-storagedriver-filesystem/main.go
+++ b/cmd/registry-storagedriver-filesystem/main.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package main
 
 import (
diff --git a/cmd/registry-storagedriver-inmemory/main.go b/cmd/registry-storagedriver-inmemory/main.go
index 77b1c5308..b75d36947 100644
--- a/cmd/registry-storagedriver-inmemory/main.go
+++ b/cmd/registry-storagedriver-inmemory/main.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package main
 
 import (
diff --git a/cmd/registry-storagedriver-s3/main.go b/cmd/registry-storagedriver-s3/main.go
index 21192a0f3..e2234b7b9 100644
--- a/cmd/registry-storagedriver-s3/main.go
+++ b/cmd/registry-storagedriver-s3/main.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package main
 
 import (
diff --git a/cmd/registry/main.go b/cmd/registry/main.go
index 150c7d6bc..29fa24c15 100644
--- a/cmd/registry/main.go
+++ b/cmd/registry/main.go
@@ -15,7 +15,6 @@ import (
 	"github.com/docker/docker-registry/configuration"
 	_ "github.com/docker/docker-registry/storagedriver/filesystem"
 	_ "github.com/docker/docker-registry/storagedriver/inmemory"
-	_ "github.com/docker/docker-registry/storagedriver/s3"
 )
 
 func main() {