diff --git a/test/http/test_http_requests.py b/test/http/test_http_requests.py
index ce845502d..62d6d7d3c 100644
--- a/test/http/test_http_requests.py
+++ b/test/http/test_http_requests.py
@@ -1,3 +1,4 @@
+import pytest
 import tableauserverclient as TSC
 import unittest
 import requests
@@ -27,91 +28,103 @@ def __init__(self, status_code):
     return MockResponse(200)
 
 
-class ServerTests(unittest.TestCase):
-    def test_init_server_model_empty_throws(self):
-        with self.assertRaises(TypeError):
-            server = TSC.Server()
-
-    def test_init_server_model_no_protocol_defaults_htt(self):
-        server = TSC.Server("fake-url")
-
-    def test_init_server_model_valid_server_name_works(self):
-        server = TSC.Server("http://fake-url")
-
-    def test_init_server_model_valid_https_server_name_works(self):
-        # by default, it will just set the version to 2.3
-        server = TSC.Server("https://fake-url")
-
-    def test_init_server_model_bad_server_name_not_version_check(self):
-        server = TSC.Server("fake-url", use_server_version=False)
-
-    @mock.patch("requests.sessions.Session.get", side_effect=mocked_requests_get)
-    def test_init_server_model_bad_server_name_do_version_check(self, mock_get):
-        server = TSC.Server("fake-url", use_server_version=True)
-
-    def test_init_server_model_bad_server_name_not_version_check_random_options(self):
-        # with self.assertRaises(MissingSchema):
-        server = TSC.Server("fake-url", use_server_version=False, http_options={"foo": 1})
-
-    def test_init_server_model_bad_server_name_not_version_check_real_options(self):
-        # with self.assertRaises(ValueError):
-        server = TSC.Server("fake-url", use_server_version=False, http_options={"verify": False})
-
-    def test_http_options_skip_ssl_works(self):
-        http_options = {"verify": False}
-        server = TSC.Server("http://fake-url")
-        server.add_http_options(http_options)
-
-    def test_http_options_multiple_options_works(self):
-        http_options = {"verify": False, "birdname": "Parrot"}
-        server = TSC.Server("http://fake-url")
-        server.add_http_options(http_options)
-
-    # ValueError: dictionary update sequence element #0 has length 1; 2 is required
-    def test_http_options_multiple_dicts_fails(self):
-        http_options_1 = {"verify": False}
-        http_options_2 = {"birdname": "Parrot"}
-        server = TSC.Server("http://fake-url")
-        with self.assertRaises(ValueError):
-            server.add_http_options([http_options_1, http_options_2])
-
-    # TypeError: cannot convert dictionary update sequence element #0 to a sequence
-    def test_http_options_not_sequence_fails(self):
-        server = TSC.Server("http://fake-url")
-        with self.assertRaises(ValueError):
-            server.add_http_options({1, 2, 3})
-
-    def test_validate_connection_http(self):
-        url = "http://cookies.com"
-        server = TSC.Server(url)
-        server.validate_connection_settings()
-        self.assertEqual(url, server.server_address)
-
-    def test_validate_connection_https(self):
-        url = "https://cookies.com"
-        server = TSC.Server(url)
-        server.validate_connection_settings()
-        self.assertEqual(url, server.server_address)
-
-    def test_validate_connection_no_protocol(self):
-        url = "cookies.com"
-        fixed_url = "http://cookies.com"
-        server = TSC.Server(url)
-        server.validate_connection_settings()
-        self.assertEqual(fixed_url, server.server_address)
-
-
-class SessionTests(unittest.TestCase):
-    test_header = {"x-test": "true"}
-
-    @staticmethod
-    def session_factory():
-        session = requests.session()
-        session.headers.update(SessionTests.test_header)
-        return session
-
-    def test_session_factory_adds_headers(self):
-        test_request_bin = "http://capture-this-with-mock.com"
-        with requests_mock.mock() as m:
-            m.get(url="http://capture-this-with-mock.com/api/2.4/serverInfo", request_headers=SessionTests.test_header)
-            server = TSC.Server(test_request_bin, use_server_version=True, session_factory=SessionTests.session_factory)
+def test_init_server_model_empty_throws():
+    with pytest.raises(TypeError):
+        server = TSC.Server()
+
+
+def test_init_server_model_no_protocol_defaults_htt():
+    server = TSC.Server("fake-url")
+
+
+def test_init_server_model_valid_server_name_works():
+    server = TSC.Server("http://fake-url")
+
+
+def test_init_server_model_valid_https_server_name_works():
+    # by default, it will just set the version to 2.3
+    server = TSC.Server("https://fake-url")
+
+
+def test_init_server_model_bad_server_name_not_version_check():
+    server = TSC.Server("fake-url", use_server_version=False)
+
+
+@mock.patch("requests.sessions.Session.get", side_effect=mocked_requests_get)
+def test_init_server_model_bad_server_name_do_version_check(mock_get):
+    server = TSC.Server("fake-url", use_server_version=True)
+
+
+def test_init_server_model_bad_server_name_not_version_check_random_options():
+    server = TSC.Server("fake-url", use_server_version=False, http_options={"foo": 1})
+
+
+def test_init_server_model_bad_server_name_not_version_check_real_options():
+    server = TSC.Server("fake-url", use_server_version=False, http_options={"verify": False})
+
+
+def test_http_options_skip_ssl_works():
+    http_options = {"verify": False}
+    server = TSC.Server("http://fake-url")
+    server.add_http_options(http_options)
+
+
+def test_http_options_multiple_options_works():
+    http_options = {"verify": False, "birdname": "Parrot"}
+    server = TSC.Server("http://fake-url")
+    server.add_http_options(http_options)
+
+
+# ValueError: dictionary update sequence element #0 has length 1; 2 is required
+def test_http_options_multiple_dicts_fails():
+    http_options_1 = {"verify": False}
+    http_options_2 = {"birdname": "Parrot"}
+    server = TSC.Server("http://fake-url")
+    with pytest.raises(ValueError):
+        server.add_http_options([http_options_1, http_options_2])
+
+
+# TypeError: cannot convert dictionary update sequence element #0 to a sequence
+def test_http_options_not_sequence_fails():
+    server = TSC.Server("http://fake-url")
+    with pytest.raises(ValueError):
+        server.add_http_options({1, 2, 3})
+
+
+def test_validate_connection_http():
+    url = "http://cookies.com"
+    server = TSC.Server(url)
+    server.validate_connection_settings()
+    assert url == server.server_address
+
+
+def test_validate_connection_https():
+    url = "https://cookies.com"
+    server = TSC.Server(url)
+    server.validate_connection_settings()
+    assert url == server.server_address
+
+
+def test_validate_connection_no_protocol():
+    url = "cookies.com"
+    fixed_url = "http://cookies.com"
+    server = TSC.Server(url)
+    server.validate_connection_settings()
+    assert fixed_url == server.server_address
+
+
+test_header = {"x-test": "true"}
+
+
+@pytest.fixture
+def session_factory() -> requests.Session:
+    session = requests.session()
+    session.headers.update(test_header)
+    return session
+
+
+def test_session_factory_adds_headers(session_factory):
+    test_request_bin = "http://capture-this-with-mock.com"
+    with requests_mock.mock() as m:
+        m.get(url="http://capture-this-with-mock.com/api/2.4/serverInfo", request_headers=test_header)
+        server = TSC.Server(test_request_bin, use_server_version=True, session_factory=lambda: session_factory)
diff --git a/test/test_datasource.py b/test/test_datasource.py
index 7f4cca759..56eb11ab7 100644
--- a/test/test_datasource.py
+++ b/test/test_datasource.py
@@ -895,7 +895,8 @@ def test_publish_description(server: TSC.Server) -> None:
     ds_elem = body.find(".//datasource")
     assert ds_elem is not None
     assert ds_elem.attrib["description"] == "Sample description"
-    
+
+
 def test_get_datasource_no_owner(server: TSC.Server) -> None:
     with requests_mock.mock() as m:
         m.get(server.datasources.baseurl, text=GET_NO_OWNER.read_text())