diff --git a/astroquery/dace/tests/test_dace.py b/astroquery/dace/tests/test_dace.py
index 204233b61e..b8be0bb9f5 100644
--- a/astroquery/dace/tests/test_dace.py
+++ b/astroquery/dace/tests/test_dace.py
@@ -1,5 +1,4 @@
 import os
-import unittest
 import json
 from astroquery.dace import Dace
 
@@ -8,24 +7,19 @@
 }
 
 
-class TestDaceClass(unittest.TestCase):
-    def test_transform_data_as_dict(self):
-        expected_parameter_dict = {'ccf_noise': [0.005320016177906, 0.00393390440796704, 0.0032324617496158],
-                                   'ins_name': ['CORALIE98', 'CORALIE98', 'HARPS'],
-                                   'drs_qc': [True, True, False],
-                                   'rjd': [51031, 51039, 51088],
-                                   'rv': [31300.4226771379, 31295.5671320506, 31294.3391634734],
-                                   'rv_err': [5.420218247708816, 4.0697289792344185, 3.4386352834851026]}
-        with open(self._data_path('parameter_list.json'), 'r') as file:
-            parameter_list = json.load(file)
-        parameter_dict = Dace.transform_data_as_dict(parameter_list)
-        assert parameter_dict == expected_parameter_dict
+def test_transform_data_as_dict():
+    expected_parameter_dict = {'ccf_noise': [0.005320016177906, 0.00393390440796704, 0.0032324617496158],
+                               'ins_name': ['CORALIE98', 'CORALIE98', 'HARPS'],
+                               'drs_qc': [True, True, False],
+                               'rjd': [51031, 51039, 51088],
+                               'rv': [31300.4226771379, 31295.5671320506, 31294.3391634734],
+                               'rv_err': [5.420218247708816, 4.0697289792344185, 3.4386352834851026]}
+    with open(_data_path('parameter_list.json'), 'r') as file:
+        parameter_list = json.load(file)
+    parameter_dict = Dace.transform_data_as_dict(parameter_list)
+    assert parameter_dict == expected_parameter_dict
 
-    @staticmethod
-    def _data_path(filename):
-        data_dir = os.path.join(os.path.dirname(__file__), 'data')
-        return os.path.join(data_dir, filename)
 
-
-if __name__ == "__main__":
-    unittest.main()
+def _data_path(filename):
+    data_dir = os.path.join(os.path.dirname(__file__), 'data')
+    return os.path.join(data_dir, filename)
diff --git a/astroquery/gaia/tests/test_gaiatap.py b/astroquery/gaia/tests/test_gaiatap.py
index 079019c8fe..678b205653 100644
--- a/astroquery/gaia/tests/test_gaiatap.py
+++ b/astroquery/gaia/tests/test_gaiatap.py
@@ -14,7 +14,6 @@
 
 
 """
-import unittest
 import os
 from unittest.mock import patch
 
@@ -40,7 +39,7 @@ def data_path(filename):
     return os.path.join(data_dir, filename)
 
 
-class TestTap(unittest.TestCase):
+class TestTap():
 
     def test_query_object(self):
         conn_handler = DummyConnHandler()
@@ -609,8 +608,3 @@ def test_logout(self, mock_logout):
         mock_logout.side_effect = HTTPError("Login error")
         tap.logout()
         assert (mock_logout.call_count == 3)
-
-
-if __name__ == "__main__":
-    # import sys;sys.argv = ['', 'Test.testName']
-    unittest.main()