diff --git a/tests/test_aggrid.py b/tests/test_aggrid.py
index 5a5aa308..f6596ee7 100644
--- a/tests/test_aggrid.py
+++ b/tests/test_aggrid.py
@@ -18,17 +18,17 @@ class TestAgGrid(BaseSeleniumTest):
     testing AgGrid integration
     """
 
-    async def setUp(self, **kwargs):
+    async def asyncSetUp(self, **kwargs):
         """
         setup test environment
         """
-        await super().setUp(port=8124, **kwargs)
+        await super().asyncSetUp(port=8124, **kwargs)
         self.data = [
             {"name": "Bob", "age": 42, "birthdate": datetime.date(year=2000, month=1, day=1)},
             {"name": "Alice", "age": 24, "birthdate": datetime.date(year=2022, month=1, day=1)},
         ]
 
-    async def tearDown(self):
+    async def asyncTearDown(self):
         """
         close test environment
         """
diff --git a/tests/test_ajax.py b/tests/test_ajax.py
index d929154d..302285cb 100644
--- a/tests/test_ajax.py
+++ b/tests/test_ajax.py
@@ -13,8 +13,8 @@ class TestAjaxWithSelenium(BaseSeleniumTest):
     testing ajax (non-websocket) behavior
     """
 
-    async def setUp(self):
-        await super().setUp(port=8126)
+    async def asyncSetUp(self):
+        await super().asyncSetUp(port=8126)
         
     async def testAjax(self):
         """
diff --git a/tests/test_issue150.py b/tests/test_issue150.py
index d7505e26..8fccb1b5 100644
--- a/tests/test_issue150.py
+++ b/tests/test_issue150.py
@@ -21,10 +21,10 @@ class TestIssue150(BaseSeleniumTest):
     https://github.com/justpy-org/justpy/issues/150
     """
 
-    async def setUp(self):
-        await BaseSeleniumTest.setUp(self,port=8124)
+    async def asyncSetUp(self):
+        await BaseSeleniumTest.asyncSetUp(self,port=8124)
 
-    async def tearDown(self):
+    async def asyncTearDown(self):
         self.browser.close()
         await asyncio.sleep(self.server.sleep_time)
         await self.server.stop()
diff --git a/tests/test_issue304.py b/tests/test_issue304.py
index d43c08e5..d34ed962 100644
--- a/tests/test_issue304.py
+++ b/tests/test_issue304.py
@@ -19,7 +19,7 @@ class TestIssue304(BaseSeleniumTest):
     https://github.com/justpy-org/justpy/issues/304
     """
 
-    async def tearDown(self):
+    async def asyncTearDown(self):
         """
         close selenium browser and stop server
         """
diff --git a/tests/test_with_selenium_clickdemo.py b/tests/test_with_selenium_clickdemo.py
index 030ab546..20e2d1a8 100644
--- a/tests/test_with_selenium_clickdemo.py
+++ b/tests/test_with_selenium_clickdemo.py
@@ -13,8 +13,8 @@ class TestClickDemoWithSelenium(BaseSeleniumTest):
     testing actual browser behavior with selenium
     """
 
-    async def setUp(self):
-        await BaseSeleniumTest.setUp(self,port=8124)
+    async def asyncSetUp(self):
+        await BaseSeleniumTest.asyncSetUp(self,port=8124)
 
     async def onDivClick(self, msg):
         """
diff --git a/tests/test_with_selenium_issue279.py b/tests/test_with_selenium_issue279.py
index 09cc0558..cdecc030 100644
--- a/tests/test_with_selenium_issue279.py
+++ b/tests/test_with_selenium_issue279.py
@@ -14,8 +14,8 @@ class TestIssue279WithSelenium(BaseSeleniumTest):
     testing actual browser behavior with selenium
     """
 
-    async def setUp(self):
-        await super().setUp(port=8125)
+    async def asyncSetUp(self):
+        await super().asyncSetUp(port=8125)
    
     async def testIssue279(self):
         """