diff --git a/Makefile b/Makefile
index df0902c31..ccad7d5bc 100644
--- a/Makefile
+++ b/Makefile
@@ -54,6 +54,7 @@ linters_js:
 coverage:
 	@. $(VIRTUALENV)/bin/activate;\
 	cd service;\
+	export PYTHONPATH=$(PYTHONPATH):`pwd`;\
 	coverage run -p --source=pixelated `which trial` test.unit;\
 	coverage run -p --source=pixelated `which trial` test.integration;\
 	coverage combine;\
@@ -62,6 +63,7 @@ coverage:
 unit_tests_py:
 	@. $(VIRTUALENV)/bin/activate;\
 	cd service;\
+	export PYTHONPATH=$(PYTHONPATH):`pwd`;\
 	trial --reporter=text test.unit
 
 unit_tests_js:
@@ -71,6 +73,7 @@ unit_tests_js:
 integration_tests_py:
 	@. $(VIRTUALENV)/bin/activate;\
 	cd service;\
+	export PYTHONPATH=$(PYTHONPATH):`pwd`;\
 	trial --reporter=text test.integration
 
 functional_tests: clean requirements install
diff --git a/service/requirements.txt b/service/requirements.txt
index 3ddb02df3..16fc0e0e1 100644
--- a/service/requirements.txt
+++ b/service/requirements.txt
@@ -5,7 +5,7 @@ pyasn1==0.1.9
 requests==2.11.1
 srp==1.0.6
 whoosh==2.6.0
-Twisted==16.1.1
+Twisted==17.1.0
 -e 'git+https://0xacab.org/leap/leap_pycommon.git@master#egg=leap.common'
 -e 'git+https://0xacab.org/pixelated/bitmask-dev.git@development#egg=leap.bitmask'
 -e 'git+https://0xacab.org/pixelated/soledad.git@development#egg=leap.soledad.common&subdirectory=common/'
diff --git a/service/test/unit/config/test_site.py b/service/test/unit/config/test_site.py
index 896126ecf..64a8b68a2 100644
--- a/service/test/unit/config/test_site.py
+++ b/service/test/unit/config/test_site.py
@@ -17,7 +17,7 @@
 from twisted.trial import unittest
 from mock import MagicMock
 from pixelated.config.site import PixelatedSite
-from twisted.protocols.basic import LineReceiver
+from twisted.web.test.requesthelper import DummyChannel
 
 
 class TestPixelatedSite(unittest.TestCase):
@@ -52,7 +52,7 @@ def test_does_not_add_strict_transport_security_header_if_plain_http(self):
         self.assertFalse(request.responseHeaders.hasHeader('Strict-Transport-Security'.lower()))
 
     def create_request(self):
-        channel = LineReceiver()
+        channel = DummyChannel()
         channel.site = PixelatedSite(MagicMock())
         request = PixelatedSite.requestFactory(channel=channel, queued=True)
         request.method = "GET"