diff --git a/docker/docker-compose.1604.51.yaml b/docker/docker-compose.1604.51.yaml
index 532f2b6a..d38369fe 100644
--- a/docker/docker-compose.1604.51.yaml
+++ b/docker/docker-compose.1604.51.yaml
@@ -28,6 +28,7 @@ services:
       - MAX_ALLOCS_ALLOWED_creating_10000_headers=10100
       - MAX_ALLOCS_ALLOWED_scheduling_10000_executions=20150
       - MAX_ALLOCS_ALLOWED_modifying_1000_circular_buffer_elements=50
+      - SANITIZER_ARG=--sanitize=thread
 
   performance-test:
     image: swift-nio:16.04-5.1
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index 3c52a480..04fade60 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -21,23 +21,23 @@ services:
 
   sanity:
     <<: *common
-    command: /bin/bash -cl "./scripts/sanity.sh"
+    command: /bin/bash -xcl "./scripts/sanity.sh"
 
   unit-tests:
     <<: *common
-    command: /bin/bash -cl "swift test -Xswiftc -warnings-as-errors"
+    command: /bin/bash -xcl "swift test -Xswiftc -warnings-as-errors"
 
   integration-tests:
     <<: *common
-    command: /bin/bash -cl "./scripts/integration_tests.sh"
+    command: /bin/bash -xcl "./scripts/integration_tests.sh"
 
   test:
     <<: *common
-    command: /bin/bash -cl "swift test -Xswiftc -warnings-as-errors && ./scripts/integration_tests.sh"
+    command: /bin/bash -xcl "swift test -Xswiftc -warnings-as-errors $${SANITIZER_ARG-} && ./scripts/integration_tests.sh"
 
   performance-test:
     <<: *common
-    command: /bin/bash -cl "swift build -c release && ./.build/release/NIOPerformanceTester"
+    command: /bin/bash -xcl "swift build -c release && ./.build/release/NIOPerformanceTester"
 
   # util
 
@@ -52,11 +52,11 @@ services:
     tty: true
     ports:
       - "9999:9999"
-    command: /bin/bash -cl "swift run NIOEchoServer 0.0.0.0 9999"
+    command: /bin/bash -xcl "swift run NIOEchoServer 0.0.0.0 9999"
 
   http:
     <<: *common
     tty: true
     ports:
       - "8888:8888"
-    command: /bin/bash -cl "swift run NIOHTTP1Server 0.0.0.0 8888"
+    command: /bin/bash -xcl "swift run NIOHTTP1Server 0.0.0.0 8888"