diff --git a/hack/make/test-docker-py b/hack/make/test-docker-py
index f9e4e33468..ebb813da17 100644
--- a/hack/make/test-docker-py
+++ b/hack/make/test-docker-py
@@ -7,16 +7,14 @@ source hack/make/.integration-test-helpers
 # TODO docker 17.06 cli client used in CI fails to build using a sha;
 # unable to prepare context: unable to 'git clone' to temporary context directory: error fetching: error: no such remote ref ead0bb9e08c13dd3d1712759491eee06bf5a5602
 #: exit status 128
-: "${DOCKER_PY_COMMIT:=4.1.0}"
+: "${DOCKER_PY_COMMIT:=4.2.0}"
 
 # custom options to pass py.test
-# TODO remove these skip once we update to a docker-py version that has https://github.com/docker/docker-py/pull/2485
-: "${PY_TEST_OPTIONS:=\
---deselect=tests/integration/api_container_test.py::AttachContainerTest::test_attach_no_stream \
---deselect=tests/integration/api_exec_test.py::ExecDemuxTest::test_exec_command_tty_stream_no_demux \
---deselect=tests/integration/models_images_test.py::ImageCollectionTest::test_pull_multiple \
---junitxml=${DEST}/junit-report.xml \
-}"
+#
+# This option can be used to temporarily skip flaky tests (using the `--deselect`
+# flag) until they are fixed upstream. For example:
+# --deselect=tests/integration/api_container_test.py::AttachContainerTest::test_attach_no_stream
+: "${PY_TEST_OPTIONS:=--junitxml=${DEST}/junit-report.xml}"
 (
 	bundle .integration-daemon-start