diff --git a/requirements/common.txt b/requirements/common.txt
index c20f36f..3cb65d1 100644
--- a/requirements/common.txt
+++ b/requirements/common.txt
@@ -1 +1 @@
-requests==2.20.0
+requests==2.20.0
\ No newline at end of file
diff --git a/tests/test_advisory.py b/tests/test_advisory.py
index f760612..bd468b6 100644
--- a/tests/test_advisory.py
+++ b/tests/test_advisory.py
@@ -1,4 +1,7 @@
 import unittest
+from unittest import mock
+import requests
+
 from openVulnQuery import advisory
 from openVulnQuery import constants
 
@@ -148,7 +151,7 @@ def test_advisory_advisory_factory_cvrf_with_key_cvrf_url_and_ips(self):
             adv_map[v] = k
         self.assertTrue(advisory.advisory_factory(
                         adv_map,
-                        constants.CVRF_ADVISORY_FORMAT_TOKEN,
+                        constants.DEFAULT_ADVISORY_FORMAT_TOKEN,
                         MockLogger()))
 
     def test_advisory_advisory_factory_oval_with_key_oval_url_and_ips(self):
diff --git a/tests/test_authorization.py b/tests/test_authorization.py
index 901cbff..38378f0 100644
--- a/tests/test_authorization.py
+++ b/tests/test_authorization.py
@@ -1,7 +1,7 @@
 import unittest
-
-import mock
 import requests
+from unittest import mock
+
 from openVulnQuery import authorization
 from openVulnQuery import config
 
diff --git a/tests/test_cli_api.py b/tests/test_cli_api.py
index 2425680..a118e88 100644
--- a/tests/test_cli_api.py
+++ b/tests/test_cli_api.py
@@ -2,6 +2,7 @@
 import unittest
 import os
 import inspect
+import requests
 
 from openVulnQuery import config
 from openVulnQuery import cli_api
diff --git a/tests/test_config.py b/tests/test_config.py
index 461c503..f63a7a3 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -2,6 +2,8 @@
 
 import os
 import unittest
+import requests
+from unittest import mock
 
 from openVulnQuery import config
 
diff --git a/tests/test_constants.py b/tests/test_constants.py
index 22e994f..597b8a4 100644
--- a/tests/test_constants.py
+++ b/tests/test_constants.py
@@ -1,4 +1,6 @@
 import unittest
+import requests
+from unittest import mock
 
 from openVulnQuery import constants
 
@@ -41,13 +43,11 @@
 JSON_OUTPUT_FORMAT_TOKEN = 'json'
 CSV_OUTPUT_FORMAT_TOKEN = 'csv'
 
-CVRF_ADVISORY_FORMAT_TOKEN = 'cvrf'
-OVAL_ADVISORY_FORMAT_TOKEN = 'oval'
+DEFAULT_ADVISORY_FORMAT_TOKEN = 'default'
 IOS_ADVISORY_FORMAT_TOKEN = 'ios'
 
 ADVISORY_FORMAT_TOKENS = (
-    CVRF_ADVISORY_FORMAT_TOKEN,
-    OVAL_ADVISORY_FORMAT_TOKEN,
+    DEFAULT_ADVISORY_FORMAT_TOKEN,
     IOS_ADVISORY_FORMAT_TOKEN,
 )
 
@@ -73,11 +73,8 @@ def test_constants_unchanged_csv_format_token(self):
 
     def test_constants_unchanged_cvrf_advisory_format_token(self):
         self.assertEqual(
-            constants.CVRF_ADVISORY_FORMAT_TOKEN, CVRF_ADVISORY_FORMAT_TOKEN)
+            constants.DEFAULT_ADVISORY_FORMAT_TOKEN, DEFAULT_ADVISORY_FORMAT_TOKEN)
 
-    def test_constants_unchanged_oval_advisory_format_token(self):
-        self.assertEqual(
-            constants.OVAL_ADVISORY_FORMAT_TOKEN, OVAL_ADVISORY_FORMAT_TOKEN)
 
     def test_constants_unchanged_ios_advisory_format_token(self):
         self.assertEqual(
diff --git a/tests/test_main.py b/tests/test_main.py
index bf1c882..c5eaba3 100644
--- a/tests/test_main.py
+++ b/tests/test_main.py
@@ -1,4 +1,6 @@
 import unittest
+from unittest import mock
+import requests
 
 from openVulnQuery import advisory
 from openVulnQuery import config
diff --git a/tests/test_query_client.py b/tests/test_query_client.py
index 23819ec..1869160 100644
--- a/tests/test_query_client.py
+++ b/tests/test_query_client.py
@@ -1,7 +1,9 @@
 import unittest
-import mock
 import requests
 import json
+
+from unittest import mock
+
 from openVulnQuery import query_client
 from openVulnQuery import constants
 from openVulnQuery import config
diff --git a/tests/test_query_client_cvrf.py b/tests/test_query_client_cvrf.py
index d03beb0..5cec301 100644
--- a/tests/test_query_client_cvrf.py
+++ b/tests/test_query_client_cvrf.py
@@ -2,7 +2,8 @@
 import unittest
 import pytest
 
-import mock
+from unittest import mock
+
 from openVulnQuery import advisory
 from openVulnQuery import config
 from openVulnQuery import query_client
diff --git a/tests/test_utils.py b/tests/test_utils.py
index c4773a8..5c497ac 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -1,5 +1,4 @@
 import unittest
-import mock
 import sys
 import json
 import pytest