4 files changed, 7 insertions, 6 deletions
diff --git a/test/pathod/test_language_websocket.py b/test/pathod/test_language_websocket.py
index f1105dfe..29155dba 100644
--- a/test/pathod/test_language_websocket.py
+++ b/test/pathod/test_language_websocket.py
@@ -97,7 +97,7 @@ class TestWebsocketFrame:
 
         assert self.fr("wf:r'foo'").payload == "foo"
 
-    def test_construction(self):
+    def test_construction_2(self):
         # Simple server frame
         frm = self.fr("wf:b'foo'")
         assert not frm.header.mask
diff --git a/test/pathod/test_pathoc.py b/test/pathod/test_pathoc.py
index 8d0f92ac..4e8c89c5 100644
--- a/test/pathod/test_pathoc.py
+++ b/test/pathod/test_pathoc.py
@@ -211,7 +211,7 @@ class TestDaemon(_TestDaemon):
         c.stop()
 
     @skip_windows
-    @pytest.mark.xfail
+    @pytest.mark.skip(reason="race condition")
     def test_wait_finish(self):
         c = pathoc.Pathoc(
             ("127.0.0.1", self.d.port),
diff --git a/test/pathod/test_pathod.py b/test/pathod/test_pathod.py
index 7583148b..05a3962e 100644
--- a/test/pathod/test_pathod.py
+++ b/test/pathod/test_pathod.py
@@ -129,7 +129,7 @@ class CommonTests(tutils.DaemonTests):
         l = self.d.last_log()
         # FIXME: Other binary data elements
 
-    @pytest.mark.xfail
+    @pytest.mark.skip(reason="race condition")
     def test_sizelimit(self):
         r = self.get("200:b@1g")
         assert r.status_code == 800
@@ -143,7 +143,7 @@ class CommonTests(tutils.DaemonTests):
     def test_info(self):
         assert tuple(self.d.info()["version"]) == version.IVERSION
 
-    @pytest.mark.xfail
+    @pytest.mark.skip(reason="race condition")
     def test_logs(self):
         assert self.d.clear_log()
         assert not self.d.last_log()
@@ -223,7 +223,7 @@ class CommonTests(tutils.DaemonTests):
         )
         assert r[1].payload == "test"
 
-    @pytest.mark.xfail
+    @pytest.mark.skip(reason="race condition")
     def test_websocket_frame_reflect_error(self):
         r, _ = self.pathoc(
             ["ws:/p/", "wf:-mask:knone:f'wf:b@10':i13,'a'"],
@@ -233,6 +233,7 @@ class CommonTests(tutils.DaemonTests):
         # FIXME: Race Condition?
         assert "Parse error" in self.d.text_log()
 
+    @pytest.mark.skip(reason="race condition")
     def test_websocket_frame_disconnect_error(self):
         self.pathoc(["ws:/p/", "wf:b@10:d3"], ws_read_limit=0)
         assert self.d.last_log()
diff --git a/test/pathod/tutils.py b/test/pathod/tutils.py
index 9739afde..f6ed3efb 100644
--- a/test/pathod/tutils.py
+++ b/test/pathod/tutils.py
@@ -116,7 +116,7 @@ tmpdir = netlib.tutils.tmpdir
 
 raises = netlib.tutils.raises
 
-test_data = utils.Data(__name__)
+test_data = netlib.utils.Data(__name__)
 
 
 def render(r, settings=language.Settings()):