diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
index 5238b991..4098b4ba 100644
--- a/tests/integration/conftest.py
+++ b/tests/integration/conftest.py
@@ -20,9 +20,7 @@
 import logging
 import pytest
 
-sys.path += [
-    path.join(path.dirname(__file__), "../mender_server/backend/tests/integration/")
-]
+sys.path += [path.join(path.dirname(__file__), "../mender_server/backend/tests/")]
 
 from server import Server
 from setup import (
diff --git a/tests/mender_server b/tests/mender_server
index e7f23911..55603bd8 160000
--- a/tests/mender_server
+++ b/tests/mender_server
@@ -1 +1 @@
-Subproject commit e7f239117e6e373245b9c6961f05db567810741f
+Subproject commit 55603bd8272286e19af6977a932c2f221bb76d3a