diff --git a/test/registry_tests.py b/test/registry_tests.py
index 47ae85256..5e880c85c 100644
--- a/test/registry_tests.py
+++ b/test/registry_tests.py
@@ -785,6 +785,16 @@ class V2RegistryLoginMixin(object):
 
 
 class RegistryTestsMixin(object):
+  def test_previously_bad_repo_name(self):
+    bad_names = ['logs', 'build', 'tokens', 'foo.bar', 'foo-bar', 'foo_bar']
+
+    for name in bad_names:
+      # Push a new repository with two layers.
+      self.do_push('public', name, 'public', 'password')
+
+      # Pull the repository to verify.
+      self.do_pull('public', name, 'public', 'password')
+
   def test_application_repo(self):
     # Create an application repository via the API.
     self.conduct_api_login('devtable', 'password')
diff --git a/test/test_api_usage.py b/test/test_api_usage.py
index e01dd0ce7..b1f8b7476 100644
--- a/test/test_api_usage.py
+++ b/test/test_api_usage.py
@@ -2241,7 +2241,7 @@ class TestGetRepository(ApiTestCase):
   def test_getrepo_badnames(self):
     self.login(ADMIN_ACCESS_USER)
 
-    bad_names = ['logs', 'build', 'tokens', 'foo-bar', 'foo_bar']
+    bad_names = ['logs', 'build', 'tokens', 'foo.bar', 'foo-bar', 'foo_bar']
 
     # For each bad name, create the repo.
     for bad_name in bad_names: