diff --git a/tests/document/instance.py b/tests/document/instance.py
index 3b5a4bd9..4c67046a 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -18,11 +18,12 @@ from mongoengine.errors import (NotRegistered, InvalidDocumentError,
 from mongoengine.queryset import NULLIFY, Q
 from mongoengine.connection import get_db
 from mongoengine.base import get_document
+from mongoengine.context_managers import switch_db
 
 TEST_IMAGE_PATH = os.path.join(os.path.dirname(__file__),
                                '../fields/mongoengine.png')
 
-__all__ = ("InstanceTest",)
+__all__ = ("InstanceTest", "ValidatorErrorTest")
 
 
 class InstanceTest(unittest.TestCase):
@@ -1926,6 +1927,56 @@ class InstanceTest(unittest.TestCase):
                                         }
                                    )]), "1,2")
 
+    def test_switch_db_instance(self):
+        register_connection('testdb-1', 'mongoenginetest2')
+
+        class Group(Document):
+            name = StringField()
+
+        Group.drop_collection()
+        with switch_db(Group, 'testdb-1') as Group:
+            Group.drop_collection()
+
+        Group(name="hello - default").save()
+        self.assertEqual(1, Group.objects.count())
+
+        group = Group.objects.first()
+        group.switch_db('testdb-1')
+        group.name = "hello - testdb!"
+        group.save()
+
+        with switch_db(Group, 'testdb-1') as Group:
+            group = Group.objects.first()
+            self.assertEqual("hello - testdb!", group.name)
+
+        group = Group.objects.first()
+        self.assertEqual("hello - default", group.name)
+
+        # Slightly contrived now - perform an update
+        # Only works as they have the same object_id
+        group.switch_db('testdb-1')
+        group.update(set__name="hello - update")
+
+        with switch_db(Group, 'testdb-1') as Group:
+            group = Group.objects.first()
+            self.assertEqual("hello - update", group.name)
+            Group.drop_collection()
+            self.assertEqual(0, Group.objects.count())
+
+        group = Group.objects.first()
+        self.assertEqual("hello - default", group.name)
+
+        # Totally contrived now - perform a delete
+        # Only works as they have the same object_id
+        group.switch_db('testdb-1')
+        group.delete()
+
+        with switch_db(Group, 'testdb-1') as Group:
+            self.assertEqual(0, Group.objects.count())
+
+        group = Group.objects.first()
+        self.assertEqual("hello - default", group.name)
+
 
 class ValidatorErrorTest(unittest.TestCase):
 
@@ -2114,56 +2165,6 @@ class ValidatorErrorTest(unittest.TestCase):
         self.assertEqual(classic_doc, dict_doc)
         self.assertEqual(classic_doc._data, dict_doc._data)
 
-    def test_switch_db_instance(self):
-        register_connection('testdb-1', 'mongoenginetest2')
-
-        class Group(Document):
-            name = StringField()
-
-        Group.drop_collection()
-        with SwitchDB(Group, 'testdb-1') as Group:
-            Group.drop_collection()
-
-        Group(name="hello - default").save()
-        self.assertEqual(1, Group.objects.count())
-
-        group = Group.objects.first()
-        group.switch_db('testdb-1')
-        group.name = "hello - testdb!"
-        group.save()
-
-        with SwitchDB(Group, 'testdb-1') as Group:
-            group = Group.objects.first()
-            self.assertEqual("hello - testdb!", group.name)
-
-        group = Group.objects.first()
-        self.assertEqual("hello - default", group.name)
-
-        # Slightly contrived now - perform an update
-        # Only works as they have the same object_id
-        group.switch_db('testdb-1')
-        group.update(set__name="hello - update")
-
-        with SwitchDB(Group, 'testdb-1') as Group:
-            group = Group.objects.first()
-            self.assertEqual("hello - update", group.name)
-            Group.drop_collection()
-            self.assertEqual(0, Group.objects.count())
-
-        group = Group.objects.first()
-        self.assertEqual("hello - default", group.name)
-
-        # Totally contrived now - perform a delete
-        # Only works as they have the same object_id
-        group.switch_db('testdb-1')
-        group.delete()
-
-        with SwitchDB(Group, 'testdb-1') as Group:
-            self.assertEqual(0, Group.objects.count())
-
-        group = Group.objects.first()
-        self.assertEqual("hello - default", group.name)
-
 
 if __name__ == '__main__':
     unittest.main()