From 529f3bd9b655cbae5e4d8b6fe9628edce48f2939 Mon Sep 17 00:00:00 2001
From: Jakub Roztocil <jakub@roztocil.name>
Date: Sat, 28 Jun 2014 19:52:10 +0200
Subject: [PATCH] Fixed `python setup.py test`

---
 setup.py                  | 4 +++-
 tests/test_regressions.py | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index a4cc2719..3e2917c4 100644
--- a/setup.py
+++ b/setup.py
@@ -25,8 +25,10 @@ class PyTest(TestCommand):
 
 
 tests_require = [
-    'pytest',
+    # Pytest needs to come last.
+    # <bitbucket.org/pypa/setuptools/issue/196/tests_require-pytest-pytest-cov-breaks>
     'pytest-httpbin',
+    'pytest',
 ]
 
 
diff --git a/tests/test_regressions.py b/tests/test_regressions.py
index b80fba38..4c939ddd 100644
--- a/tests/test_regressions.py
+++ b/tests/test_regressions.py
@@ -1,5 +1,4 @@
 """Miscellaneous regression tests"""
-import socket
 
 from utils import http, HTTP_OK