diff --git a/tests/functional/test_base.py b/tests/functional/test_base.py
index 8a67d0b..f7e4c25 100644
--- a/tests/functional/test_base.py
+++ b/tests/functional/test_base.py
@@ -42,8 +42,8 @@ class TestBase(unittest.TestCase):
             else:
                 print("\nTesting %s v%d" % (cls.testcase_name, cls.api_version))
 
-        cls.client = trovebox.Trovebox(config_file=cls.config_file,
-                                         api_version=cls.api_version)
+        cls.client = trovebox.Trovebox(config_file=cls.config_file)
+        cls.client.configure(api_version=cls.api_version)
 
         if cls.client.photos.list() != []:
             raise ValueError("The test server (%s) contains photos. "
diff --git a/tests/functional/test_framework.py b/tests/functional/test_framework.py
index 8495f0d..9444e4b 100644
--- a/tests/functional/test_framework.py
+++ b/tests/functional/test_framework.py
@@ -16,8 +16,8 @@ class TestFramework(test_base.TestBase):
         """
         API v0 has a special hello world message
         """
-        client = trovebox.Trovebox(config_file=self.config_file,
-                                   api_version=0)
+        client = trovebox.Trovebox(config_file=self.config_file)
+        client.configure(api_version=0)
         result = client.get("hello.json")
         self.assertEqual(result['message'],
                          "Hello, world! This is version zero of the API!")
@@ -28,8 +28,8 @@ class TestFramework(test_base.TestBase):
         For all API versions >0, we get a generic hello world message
         """
         for api_version in range(1, test_base.get_test_server_api() + 1):
-            client = trovebox.Trovebox(config_file=self.config_file,
-                                       api_version=api_version)
+            client = trovebox.Trovebox(config_file=self.config_file)
+            client.configure(api_version=api_version)
             result = client.get("hello.json")
             self.assertEqual(result['message'], "Hello, world!")
             self.assertEqual(result['result']['__route__'],
@@ -40,8 +40,7 @@ class TestFramework(test_base.TestBase):
         If the API version is unspecified,
         we get a generic hello world message.
         """
-        client = trovebox.Trovebox(config_file=self.config_file,
-                                   api_version=None)
+        client = trovebox.Trovebox(config_file=self.config_file)
         result = client.get("hello.json")
         self.assertEqual(result['message'], "Hello, world!")
         self.assertEqual(result['result']['__route__'], "/hello.json")
@@ -52,7 +51,7 @@ class TestFramework(test_base.TestBase):
         (ValueError, since the returned 404 HTML page is not valid JSON)
         """
         version = trovebox.LATEST_API_VERSION + 1
-        client = trovebox.Trovebox(config_file=self.config_file,
-                                   api_version=version)
+        client = trovebox.Trovebox(config_file=self.config_file)
+        client.configure(api_version=version)
         with self.assertRaises(trovebox.Trovebox404Error):
             client.get("hello.json")