1 files changed, 15 insertions, 12 deletions
diff --git a/test/conftest.py b/test/conftest.py
index bb913548..27918cf9 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -1,15 +1,10 @@
 import os
-import pytest
-import OpenSSL
+import socket
 
-import mitmproxy.net.tcp
+import pytest
 
 pytest_plugins = ('test.full_coverage_plugin',)
 
-requires_alpn = pytest.mark.skipif(
-    not mitmproxy.net.tcp.HAS_ALPN,
-    reason='requires OpenSSL with ALPN support')
-
 skip_windows = pytest.mark.skipif(
     os.name == "nt",
     reason='Skipping due to Windows'
@@ -25,8 +20,16 @@ skip_appveyor = pytest.mark.skipif(
     reason='Skipping due to Appveyor'
 )
 
-
-@pytest.fixture()
-def disable_alpn(monkeypatch):
-    monkeypatch.setattr(mitmproxy.net.tcp, 'HAS_ALPN', False)
-    monkeypatch.setattr(OpenSSL.SSL._lib, 'Cryptography_HAS_ALPN', False)
+try:
+    s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
+    s.bind(("::1", 0))
+    s.close()
+except OSError:
+    no_ipv6 = True
+else:
+    no_ipv6 = False
+
+skip_no_ipv6 = pytest.mark.skipif(
+    no_ipv6,
+    reason='Host has no IPv6 support'
+)