diff --git a/provider_test.go b/provider_test.go
new file mode 100644
index 0000000..df3d877
--- /dev/null
+++ b/provider_test.go
@@ -0,0 +1,22 @@
+package gophercloud
+
+import (
+	"testing"
+)
+
+func TestProviderRegistry(t *testing.T) {
+	c := TestContext()
+
+	_, err := c.ProviderByName("aProvider")
+	if err == nil {
+		t.Error("Expected error when looking for a provider by non-existant name")
+		return
+	}
+
+	_ = c.RegisterProvider("aProvider", &Provider{})
+	_, err = c.ProviderByName("aProvider")
+	if err != nil {
+		t.Error(err)
+		return
+	}
+}