diff --git a/nova/quota.py b/nova/quota.py
index a311ecc87f..818c4a4751 100644
--- a/nova/quota.py
+++ b/nova/quota.py
@@ -768,6 +768,19 @@ class NoopQuotaDriver(object):
         pass
 
 
+class UnifiedLimitsDriver(NoopQuotaDriver):
+    """Ease migration to new unified limits code.
+
+    Help ease migration to unified limits by ensuring the old code
+    paths still work with unified limits. Eventually the expectation is
+    all this legacy quota code will go away, leaving the new simpler code
+    """
+
+    def __init__(self):
+        LOG.warning("The Unified Limits Quota Driver is experimental and "
+                    "is under active development. Do not use this driver.")
+
+
 class BaseResource(object):
     """Describe a single resource for quota checking."""
 
diff --git a/nova/tests/unit/test_quota.py b/nova/tests/unit/test_quota.py
index 48910cf75c..c9784602a9 100644
--- a/nova/tests/unit/test_quota.py
+++ b/nova/tests/unit/test_quota.py
@@ -1871,6 +1871,12 @@ class NoopQuotaDriverTestCase(test.TestCase):
         self.assertEqual(self.expected_settable_quotas, result)
 
 
+class UnifiedLimitsDriverTestCase(NoopQuotaDriverTestCase):
+    def setUp(self):
+        super(UnifiedLimitsDriverTestCase, self).setUp()
+        self.driver = quota.UnifiedLimitsDriver()
+
+
 @ddt.ddt
 class QuotaCountTestCase(test.NoDBTestCase):
     @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'