diff --git a/storage/storagetest/storagetest.go b/storage/conformance/conformance.go
similarity index 96%
rename from storage/storagetest/storagetest.go
rename to storage/conformance/conformance.go
index e0dac52e..fac7553f 100644
--- a/storage/storagetest/storagetest.go
+++ b/storage/conformance/conformance.go
@@ -1,7 +1,7 @@
 // +build go1.7
 
-// Package storagetest provides conformance tests for storage implementations.
-package storagetest
+// Package conformance provides conformance tests for storage implementations.
+package conformance
 
 import (
 	"reflect"
diff --git a/storage/kubernetes/storage_test.go b/storage/kubernetes/storage_test.go
index 7c4ef2d3..cb3cbe2f 100644
--- a/storage/kubernetes/storage_test.go
+++ b/storage/kubernetes/storage_test.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/coreos/dex/storage/storagetest"
+	"github.com/coreos/dex/storage/conformance"
 )
 
 func TestLoadClient(t *testing.T) {
@@ -73,5 +73,5 @@ func TestURLFor(t *testing.T) {
 
 func TestStorage(t *testing.T) {
 	client := loadClient(t)
-	storagetest.RunTestSuite(t, client)
+	conformance.RunTestSuite(t, client)
 }
diff --git a/storage/memory/memory_test.go b/storage/memory/memory_test.go
index 1ec09381..73f2a790 100644
--- a/storage/memory/memory_test.go
+++ b/storage/memory/memory_test.go
@@ -3,10 +3,10 @@ package memory
 import (
 	"testing"
 
-	"github.com/coreos/dex/storage/storagetest"
+	"github.com/coreos/dex/storage/conformance"
 )
 
 func TestStorage(t *testing.T) {
 	s := New()
-	storagetest.RunTestSuite(t, s)
+	conformance.RunTestSuite(t, s)
 }