diff --git a/tests/test_service.py b/tests/test_service.py
index 971764c0..850eab3f 100755
--- a/tests/test_service.py
+++ b/tests/test_service.py
@@ -26,7 +26,8 @@
 
 class ServiceTestCase(testlib.SDKTestCase):
     def test_autologin(self):
-        service = client.connect(autologin=True, **self.opts.kwargs)
+        self.assertTrue(self.opts.kwargs.get("autologin"))
+        service = client.connect(**self.opts.kwargs)
         self.service.restart(timeout=120)
         reader = service.jobs.oneshot("search index=internal | head 1")
         self.assertIsNotNone(reader)
diff --git a/tests/testlib.py b/tests/testlib.py
index 57ab1f2d..b3a41a88 100644
--- a/tests/testlib.py
+++ b/tests/testlib.py
@@ -233,7 +233,7 @@ def restartSplunk(self, timeout=240):
     @classmethod
     def setUpClass(cls):
         cls.opts = parse([], {}, ".env")
-        cls.opts.kwargs.update({"retries": 3})
+        cls.opts.kwargs.update({"retries": 3, "autologin": True})
         # Before we start, make sure splunk doesn't need a restart.
         service = client.connect(**cls.opts.kwargs)
         if service.restart_required: