diff --git a/‎.gitignore‎
Lines changed: 10 additions & 3 deletions b/‎.gitignore‎
Lines changed: 10 additions & 3 deletions
diff --git a/‎tox.ini‎
Lines changed: 6 additions & 0 deletions b/‎tox.ini‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎webuntis/tests/__init__.py‎
Lines changed: 19 additions & 26 deletions b/‎webuntis/tests/__init__.py‎
Lines changed: 19 additions & 26 deletions
@@ -1,6 +1,13 @@
-__pycache__
+*.egg
+*.egg-info
 *.pyc
-docs/_build/
-dist/
 .coverage
+.tox
+__pycache__
+dist
+dist/
+docs/_build/
+env
+env*
+fabfile*
 htmlcov
@@ -0,0 +1,6 @@
+[tox]
+envlist=py27,py32,pypy
+
+[testenv]
+commands=python run-tests.py
+deps=mock
@@ -340,7 +340,7 @@ def test_optionparsers_credentials(self):
             (void_user_and_pwd, {}),
             (user_and_void_pwd, {}),
             (void_user_and_void_pwd, {}),
-            (dict(user_and_pwd.items() + void_jsessionid.items()), user_and_pwd)
+            (dict(user_and_pwd, **void_jsessionid), user_and_pwd)
         ]
 
         for parser_input, expected_output in tests:
@@ -466,33 +466,26 @@ def test_loggedout(self):
         self.assertFalse('jsessionid' in creds)
         self.assertRaises(webuntis.errors.AuthError, self.session.klassen)
 
+class test_cases(object):
+    offline = WebUntisOfflineTests
+    online = WebUntisRemoteTests
+
+def mk_suite(tests):
+    loader = unittest.TestLoader()
+    suite = unittest.TestSuite()
+    for test in tests:
+        suite.addTest(loader.loadTestsFromName(test, test_cases))
+
+    return suite
+
+default_suite = ['offline']
+
 
 def main():
-    try:
-        raw_input  # check if we have python2
-    except NameError:
-        prompt = input
-    else:
-        prompt = raw_input
-
-    def load(test):
-        suite = unittest.TestLoader().loadTestsFromTestCase(test)
-        unittest.TextTestRunner(verbosity=2).run(suite)
-
-    tests = [WebUntisOfflineTests, WebUntisRemoteTests]
-
-    if len(sys.argv) == 1:
-        print('ERROR: No tests specified.\nAdd a number to the command-line arguments to execute the test:\n')
-        for i, test in enumerate(tests):
-            print('###{}: {}'.format(i, test.__name__))
-            print(test.__doc__)
-        exit(1)
-
-    checked_tests = [tests[int(x)] for x in sys.argv[1:]]
-
-    for test in checked_tests:
-        prompt('Hit enter to continue.')
-        load(test)
+    suite = mk_suite(sys.argv[1:] or default_suite)
+    result = unittest.TextTestRunner(verbosity=2).run(suite) 
+    if result.errors or result.failures:
+        sys.exit(1)
 
 if __name__ == '__main__':
     main()