diff --git a/ckanext/datastore/tests/test_plugin.py b/ckanext/datastore/tests/test_plugin.py
index 0b97f673066..19d824a2be3 100644
--- a/ckanext/datastore/tests/test_plugin.py
+++ b/ckanext/datastore/tests/test_plugin.py
@@ -9,7 +9,14 @@
 
 class TestPlugin(object):
     @classmethod
-    def setup(cls):
+    def setup_class(cls):
+        if p.plugin_loaded('datastore'):
+            p.unload('datastore')
+        if p.plugin_loaded('sample_datastore_plugin'):
+            p.unload('sample_datastore_plugin')
+
+    @classmethod
+    def teardown_class(cls):
         if p.plugin_loaded('datastore'):
             p.unload('datastore')
         if p.plugin_loaded('sample_datastore_plugin'):