diff --git a/conftest.py b/conftest.py
index 055c1b5ae..4f48c56c2 100644
--- a/conftest.py
+++ b/conftest.py
@@ -219,7 +219,6 @@ def _load_module(module_name, path):
 _load_module("mscolab_settings", path)
 
 
-'''
 @pytest.fixture(autouse=True)
 def fail_if_open_message_boxes_left():
     """Fail a test if there are any Qt message boxes left open at the end
@@ -243,7 +242,6 @@ def fail_if_open_message_boxes_left():
         # Some objects deny permission, pass in that case
         except RuntimeError:
             pass
-'''
 
 @pytest.fixture(scope="session", autouse=True)
 def configure_testsetup(request):
diff --git a/tests/_test_msui/test_mscolab.py b/tests/_test_msui/test_mscolab.py
index 6065c4475..304a506d2 100644
--- a/tests/_test_msui/test_mscolab.py
+++ b/tests/_test_msui/test_mscolab.py
@@ -46,7 +46,7 @@
 from tests.constants import MSUI_CONFIG_PATH
 from mslib.mscolab.seed import add_user, get_user, add_operation, add_user_to_operation
 
-PORTS = list(range(18000, 18500))
+PORTS = list(range(25000, 25500))
 
 
 class Test_Mscolab_connect_window():
@@ -700,7 +700,6 @@ def test_delete_operation_from_list(self, mockbox):
         self.window.mscolab.delete_operation_from_list(op_id)
         assert self.window.mscolab.active_op_id is None
 
-    @pytest.mark.skip(reason="needs review for py311")
     @mock.patch("PyQt5.QtWidgets.QMessageBox.question", return_value=QtWidgets.QMessageBox.Yes)
     def test_user_delete(self, mockmessage):
         self._connect_to_mscolab()
diff --git a/tests/_test_msui/test_mss.py b/tests/_test_msui/test_mss.py
index 7fe548b81..18004bffb 100644
--- a/tests/_test_msui/test_mss.py
+++ b/tests/_test_msui/test_mss.py
@@ -25,13 +25,11 @@
     limitations under the License.
 """
 
-import pytest
 import sys
 from PyQt5 import QtWidgets, QtTest, QtCore
 from mslib.msui import mss
 
 
-@pytest.mark.skip(reason="needs review for py311")
 def test_mss_rename_message():
     application = QtWidgets.QApplication(sys.argv)
     main_window = mss.MSSMainWindow()
diff --git a/tests/_test_msui/test_msui.py b/tests/_test_msui/test_msui.py
index d31556bce..49752a3f4 100644
--- a/tests/_test_msui/test_msui.py
+++ b/tests/_test_msui/test_msui.py
@@ -176,7 +176,6 @@ def teardown_method(self):
         self.application.quit()
         QtWidgets.QApplication.processEvents()
 
-    @pytest.mark.skip(reason="needs review for py311")
     def test_no_updater(self):
         assert not hasattr(self.window, "updater")
 
diff --git a/tests/_test_utils/test_airdata.py b/tests/_test_utils/test_airdata.py
index 837ee250b..1545b15ab 100644
--- a/tests/_test_utils/test_airdata.py
+++ b/tests/_test_utils/test_airdata.py
@@ -26,7 +26,6 @@
 """
 import os
 import mock
-import pytest
 from PyQt5 import QtWidgets
 from mslib.utils.airdata import download_progress, get_airports, \
     get_available_airspaces, update_airspace, get_airspaces
@@ -161,7 +160,6 @@ def test_get_airspaces_no_data(mockbox):
     assert airspaces == []
 
 
-@pytest.mark.skip(reason="needs review for py311")
 @mock.patch("mslib.utils.airdata.download_progress", _download_progress_airspace)
 @mock.patch("PyQt5.QtWidgets.QMessageBox.question", return_value=QtWidgets.QMessageBox.Yes)
 def test_get_airspaces(mockbox):