diff --git a/test/functional/test_account.py b/test/functional/test_account.py
index b4598dd084..6cf30968d5 100644
--- a/test/functional/test_account.py
+++ b/test/functional/test_account.py
@@ -796,6 +796,14 @@ class TestAccount(unittest.TestCase):
                          'k' * self.max_meta_name_length): 'v'})
         resp.read()
         self.assertEqual(resp.status, 204)
+        # Clear it, so the value-length checking doesn't accidentally trip
+        # the overall max
+        resp = retry(post,
+                     {'X-Account-Meta-' + (
+                         'k' * self.max_meta_name_length): ''})
+        resp.read()
+        self.assertEqual(resp.status, 204)
+
         resp = retry(
             post,
             {'X-Account-Meta-' + ('k' * (
diff --git a/test/functional/test_container.py b/test/functional/test_container.py
index 4fdbe27f31..b6a4a2384a 100644
--- a/test/functional/test_container.py
+++ b/test/functional/test_container.py
@@ -407,6 +407,13 @@ class TestContainer(unittest.TestCase):
             {'X-Container-Meta-' + ('k' * self.max_meta_name_length): 'v'})
         resp.read()
         self.assertEqual(resp.status, 204)
+        # Clear it, so the value-length checking doesn't accidentally trip
+        # the overall max
+        resp = retry(
+            post,
+            {'X-Container-Meta-' + ('k' * self.max_meta_name_length): ''})
+        resp.read()
+        self.assertEqual(resp.status, 204)
         resp = retry(
             post,
             {'X-Container-Meta-' + (