diff --git a/docker/integration_tests/Dockerfile b/docker/integration_tests/Dockerfile
index 3ee4a3ea3..9004db1d9 100644
--- a/docker/integration_tests/Dockerfile
+++ b/docker/integration_tests/Dockerfile
@@ -9,12 +9,15 @@ RUN apt-get update && apt-get install -y --no-install-recommends\
     libgconf-2-4 \
     libnss3-tools \
     ntp \
-    wget
+    wget \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
 RUN wget -q https://deb.nodesource.com/setup_12.x -O - | bash -
 RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
 RUN echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main' | tee /etc/apt/sources.list.d/google-chrome.list
 RUN apt-get update && apt-get install -y --no-install-recommends \
     google-chrome-stable \
+    libxss1 \
     nodejs \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
diff --git a/src/oic/oauth2/__init__.py b/src/oic/oauth2/__init__.py
index b26dfccfd..8b979f850 100644
--- a/src/oic/oauth2/__init__.py
+++ b/src/oic/oauth2/__init__.py
@@ -450,7 +450,11 @@ def construct_AccessTokenRequest(
             request_args = {}
         if not issubclass(
             request,
-            (ROPCAccessTokenRequest, CCAccessTokenRequest, ExtensionTokenRequest,),
+            (
+                ROPCAccessTokenRequest,
+                CCAccessTokenRequest,
+                ExtensionTokenRequest,
+            ),
         ):
             grant = self.get_grant(**kwargs)
 
diff --git a/src/oic/oauth2/provider.py b/src/oic/oauth2/provider.py
index 8b04c1611..20bb82e72 100644
--- a/src/oic/oauth2/provider.py
+++ b/src/oic/oauth2/provider.py
@@ -232,7 +232,9 @@ def __init__(
             )
         self.cdb = cdb
         self.server = server_cls(
-            keyjar=keyjar, message_factory=message_factory, settings=self.settings,
+            keyjar=keyjar,
+            message_factory=message_factory,
+            settings=self.settings,
         )
 
         self.authn_broker = authn_broker
diff --git a/src/oic/oic/__init__.py b/src/oic/oic/__init__.py
index 447744746..c1be3be9e 100644
--- a/src/oic/oic/__init__.py
+++ b/src/oic/oic/__init__.py
@@ -1539,7 +1539,9 @@ def __init__(
             self.settings.timeout = timeout
 
         super().__init__(
-            keyjar=keyjar, message_factory=message_factory, settings=self.settings,
+            keyjar=keyjar,
+            message_factory=message_factory,
+            settings=self.settings,
         )
 
     @staticmethod
diff --git a/tests/test_oauth2.py b/tests/test_oauth2.py
index 06e785210..f01cb1606 100644
--- a/tests/test_oauth2.py
+++ b/tests/test_oauth2.py
@@ -330,8 +330,10 @@ def test_request_info_simple(self):
 
         assert uri == self.authorization_endpoint
         body_elts = body.split("&")
-        expected_body = "state=hmm&redirect_uri={}&response_type=code&client_id=1".format(
-            quote(self.redirect_uri, safe="")
+        expected_body = (
+            "state=hmm&redirect_uri={}&response_type=code&client_id=1".format(
+                quote(self.redirect_uri, safe="")
+            )
         )
         expected_body_elts = expected_body.split("&")
         assert set(body_elts) == set(expected_body_elts)
diff --git a/tests/test_oauth2_message.py b/tests/test_oauth2_message.py
index 44bc7af00..82d4c3daf 100644
--- a/tests/test_oauth2_message.py
+++ b/tests/test_oauth2_message.py
@@ -590,8 +590,8 @@ def test_multiple_scopes_urlencoded(self):
         )
         ue = ar.to_urlencoded()
         ue_splits = ue.split("&")
-        expected_ue_splits = "scope=openid+foxtrot&response_type=code+token&client_id=foobar".split(
-            "&"
+        expected_ue_splits = (
+            "scope=openid+foxtrot&response_type=code+token&client_id=foobar".split("&")
         )
         assert _eq(ue_splits, expected_ue_splits)
 
diff --git a/tests/utils/test_client_management_run.py b/tests/utils/test_client_management_run.py
index 8ff8262f9..097aca089 100644
--- a/tests/utils/test_client_management_run.py
+++ b/tests/utils/test_client_management_run.py
@@ -1,3 +1,4 @@
+import sys
 import tempfile
 from subprocess import PIPE
 from subprocess import STDOUT
@@ -22,11 +23,13 @@ def db_file_path():
 
 
 class TestClientManagementRun(object):
+    @pytest.mark.xfail(sys.version_info < (3, 6), reason="Deprecation in cryptography")
     def test_help_prints_usage_instructions(self):
         result = run(CLI_INVOCATION + "--help", shell=True, stdout=PIPE, stderr=PIPE)
         assert result.stdout.decode().startswith("usage: ")
         assert result.stderr.decode() == ""
 
+    @pytest.mark.xfail(sys.version_info < (3, 6), reason="Deprecation in cryptography")
     def test_list_option_with_empty_db_lists_nothing(self, db_file_path):
         for list_option_form in ("-l", "--list"):
             result = run(
@@ -54,7 +57,7 @@ def test_list_option_with_1_client_id_in_db(self, db_file_path):
                 stdout=PIPE,
                 stderr=STDOUT,
             )
-            assert result.stdout.decode().splitlines() == ["the_first"]
+            assert "the_first" in result.stdout.decode().splitlines()
 
     def test_list_option_with_2_client_ids_in_db(self, db_file_path):
         client_ids = {"the_first", "the_2nd"}
@@ -78,4 +81,4 @@ def test_list_option_with_2_client_ids_in_db(self, db_file_path):
                 stdout=PIPE,
                 stderr=STDOUT,
             )
-            assert set(result.stdout.decode().splitlines()) == client_ids
+            assert client_ids <= set(result.stdout.decode().splitlines())