9 files changed, 12 insertions, 10 deletions
diff --git a/test/netlib/data/verificationcerts/generate.py b/test/netlib/data/verificationcerts/generate.py
index 9203abbb..6d4d8550 100644
--- a/test/netlib/data/verificationcerts/generate.py
+++ b/test/netlib/data/verificationcerts/generate.py
@@ -64,5 +64,3 @@ do("openssl req -x509 -new -nodes -batch "
    "-days 1024 "
    "-out self-signed.crt".format(SUBJECT)
    )
-
-
diff --git a/test/netlib/http/test_authentication.py b/test/netlib/http/test_authentication.py
index 1df7cd9c..95d72447 100644
--- a/test/netlib/http/test_authentication.py
+++ b/test/netlib/http/test_authentication.py
@@ -78,7 +78,7 @@ class TestBasicProxyAuth:
         assert ba.authenticate(headers)
 
         ba.clean(headers)
-        assert not ba.AUTH_HEADER in headers
+        assert ba.AUTH_HEADER not in headers
 
         headers[ba.AUTH_HEADER] = ""
         assert not ba.authenticate(headers)
diff --git a/test/netlib/http/test_cookies.py b/test/netlib/http/test_cookies.py
index 6f84c4ce..83b85656 100644
--- a/test/netlib/http/test_cookies.py
+++ b/test/netlib/http/test_cookies.py
@@ -184,7 +184,7 @@ def test_parse_set_cookie_pairs():
         assert ret == lst
         s2 = cookies._format_set_cookie_pairs(ret)
         ret2 = cookies._parse_set_cookie_pairs(s2)
-        assert  ret2 == lst
+        assert ret2 == lst
 
 
 def test_parse_set_cookie_header():
diff --git a/test/netlib/http/test_response.py b/test/netlib/http/test_response.py
index 5eac2a15..1faef7ec 100644
--- a/test/netlib/http/test_response.py
+++ b/test/netlib/http/test_response.py
@@ -59,7 +59,8 @@ class TestResponseUtils(object):
 
     def test_get_cookies_with_parameters(self):
         resp = tresp()
-        resp.headers = Headers(set_cookie="cookiename=cookievalue;domain=example.com;expires=Wed Oct  21 16:29:41 2015;path=/; HttpOnly")
+        cookie = "cookiename=cookievalue;domain=example.com;expires=Wed Oct  21 16:29:41 2015;path=/; HttpOnly"
+        resp.headers = Headers(set_cookie=cookie)
         result = resp.cookies
         assert len(result) == 1
         assert "cookiename" in result
diff --git a/test/netlib/test_multidict.py b/test/netlib/test_multidict.py
index 5bb65e3f..7319f1c5 100644
--- a/test/netlib/test_multidict.py
+++ b/test/netlib/test_multidict.py
@@ -49,7 +49,7 @@ class TestMultiDict(object):
         assert md["foo"] == "bar"
 
         with tutils.raises(KeyError):
-            _ = md["bar"]
+            md["bar"]
 
         md_multi = TMultiDict(
             [("foo", "a"), ("foo", "b")]
diff --git a/test/netlib/test_tcp.py b/test/netlib/test_tcp.py
index 80cdba36..083360b4 100644
--- a/test/netlib/test_tcp.py
+++ b/test/netlib/test_tcp.py
@@ -15,6 +15,7 @@ from netlib.exceptions import InvalidCertificateException, TcpReadIncomplete, Tl
 
 from . import tservers
 
+
 class EchoHandler(tcp.BaseHandler):
     sni = None
 
diff --git a/test/netlib/test_utils.py b/test/netlib/test_utils.py
index fce1d0a7..e4c81a48 100644
--- a/test/netlib/test_utils.py
+++ b/test/netlib/test_utils.py
@@ -1,7 +1,9 @@
 # coding=utf-8
+
 from netlib import utils, tutils
 from netlib.http import Headers
 
+
 def test_bidi():
     b = utils.BiDi(a=1, b=2)
     assert b.a == 1
@@ -189,4 +191,4 @@ def test_escaped_str_to_bytes():
     assert utils.escaped_str_to_bytes("ü") == b'\xc3\xbc'
     assert utils.escaped_str_to_bytes(u"\\x08") == b"\b"
     assert utils.escaped_str_to_bytes(u"&!?=\\\\)") == br"&!?=\)"
-    assert utils.escaped_str_to_bytes(u"ü") == b'\xc3\xbc'
-\ No newline at end of file
+    assert utils.escaped_str_to_bytes(u"ü") == b'\xc3\xbc'
diff --git a/test/netlib/test_wsgi.py b/test/netlib/test_wsgi.py
index 8c782b27..5c61f81c 100644
--- a/test/netlib/test_wsgi.py
+++ b/test/netlib/test_wsgi.py
@@ -11,7 +11,7 @@ def tflow():
 
 
 class ExampleApp:
-    
+
     def __init__(self):
         self.called = False
 
diff --git a/test/netlib/websockets/test_websockets.py b/test/netlib/websockets/test_websockets.py
index 024544f5..50fa26e6 100644
--- a/test/netlib/websockets/test_websockets.py
+++ b/test/netlib/websockets/test_websockets.py
@@ -120,8 +120,8 @@ class TestWebSockets(tservers.ServerTestBase):
           default builder should always generate valid frames
         """
         msg = self.random_bytes()
-        client_frame = websockets.Frame.default(msg, from_client=True)
-        server_frame = websockets.Frame.default(msg, from_client=False)
+        assert websockets.Frame.default(msg, from_client=True)
+        assert websockets.Frame.default(msg, from_client=False)
 
     def test_serialization_bijection(self):
         """