diff --git a/.appveyor.yml b/.appveyor.yml
index 4b92d5c62..136cbb272 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -11,10 +11,17 @@ environment:
       PYTHON_VERSION: "2.7.x"
       PYTHON_ARCH: "64"
       TOXENV: "py27-windows"
-    - PYTHON: "C:\\Python36-x64"
-      PYTHON_VERSION: "3.6.x"
+      WINPCAP: "false"
+    - PYTHON: "C:\\Python37-x64"
+      PYTHON_VERSION: "3.7.x"
       PYTHON_ARCH: "64"
-      TOXENV: "py36-windows"
+      TOXENV: "py37-windows"
+      WINPCAP: "false"
+    - PYTHON: "C:\\Python37-x64"
+      PYTHON_VERSION: "3.7.x"
+      PYTHON_ARCH: "64"
+      TOXENV: "py37-windows"
+      WINPCAP: "true"
 
 # There is no build phase for Scapy
 build: off
@@ -28,6 +35,21 @@ install:
   - "%PYTHON%\\python -m pip install tox"
   - set PATH=%PYTHON%\\Scripts\\;%PATH%
 
+# Compatibility run with Winpcap
+# XXX Remove me when wireshark stops using it as default
+for:
+  -
+    matrix:
+      only:
+        - WINPCAP: "true"
+    install:
+      # Install the winnpcap, windump and wireshark suites
+      - choco install -y winpcap
+      - choco install -y windump
+      - choco install -y wireshark
+      # Install Python modules
+      - "%PYTHON%\\python -m pip install tox"
+
 test_script:
   # Set environment variables
   - set PYTHONPATH=%APPVEYOR_BUILD_FOLDER%
diff --git a/tox.ini b/tox.ini
index 14dfac611..103852d4b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,7 @@
 
 
 [tox]
-envlist = py{27,34,35,36,37,py,py3}-{linux,bsd}_{non_root,root}, py{27,36}-windows-linux_garbage
+envlist = py{27,34,35,36,37,py,py3}-{linux,osx}_{non_root,root}, py{27,37}-windows, linux_warnings
 skip_missing_interpreters = true
 minversion = 2.9