diff --git a/tests/test_app.py b/tests/test_app.py
index 92af88967..e242b9ba2 100755
--- a/tests/test_app.py
+++ b/tests/test_app.py
@@ -39,13 +39,17 @@ def setUp(self):
         else:
             logging.debug("App %s already exists. Skipping creation.", self.app_name)
 
-class TestAppIntegrity(TestApp):
+    @classmethod
+    def tearDownClass(cls):
+        for app in cls.service.apps:
+            if app.name.startswith('delete-me'):
+                cls.service.apps.delete(app.name)
+
     def test_app_integrity(self):
         self.check_entity(self.app)
         self.app.setupInfo
         self.app['setupInfo']
 
-class TestDisableEnable(TestApp):
     def test_disable_enable(self):
         self.app.disable()
         self.app.refresh()
@@ -54,7 +58,6 @@ def test_disable_enable(self):
         self.app.refresh()
         self.assertEqual(self.app['disabled'], '0')
 
-class TestUpdate(TestApp):
     def test_update(self):
         kwargs = {
             'author': "Me",
@@ -70,7 +73,6 @@ def test_update(self):
         self.assertEqual(self.app['manageable'], "0")
         self.assertEqual(self.app['visible'], "1")
 
-class TestDelete(TestApp):
     def test_delete(self):
         name = testlib.tmpname()
         app = self.service.apps.create(name)
@@ -78,14 +80,12 @@ def test_delete(self):
         self.service.apps.delete(name)
         self.assertFalse(name in self.service.apps)
 
-class TestPackage(TestApp):
     def test_package(self):
         p = self.app.package()
         self.assertEqual(p.name, self.app_name)
         self.assertTrue(p.path.endswith(self.app_name + '.spl'))
         self.assertTrue(p.url.endswith(self.app_name + '.spl'))
 
-class TestUpdateInfo(TestApp):
     def test_updateInfo(self):
         p = self.app.updateInfo()
         self.assertTrue(p is not None)
diff --git a/tests/testlib.py b/tests/testlib.py
index ff6762bc6..23b186277 100644
--- a/tests/testlib.py
+++ b/tests/testlib.py
@@ -161,8 +161,11 @@ def f(_):
         wait(None, f, timeout)
         self.assertEqual(fa(), fb())
 
-    service = None
-    splunk_version = None
+    @classmethod
+    def setUpClass(cls):
+        cls.opts = parse([], {}, ".splunkrc")
+        import splunklib.client as client
+        cls.service = client.connect(**cls.opts.kwargs)
 
     def setUp(self):
         unittest.TestCase.setUp(self)
@@ -170,7 +173,8 @@ def setUp(self):
         self.opts = parse([], {}, ".splunkrc")
         self.service = client.connect(**self.opts.kwargs)
         self.splunk_version = int(self.service.info['version'].split('.')[0])
-        logging.debug("Connected to splunkd version %d", self.splunk_version)
+        logging.debug("Connected to splunkd version %s", '.'.join(str(x) for x in self.service.splunk_version))
+
 
 def main():
     unittest.main()