diff --git a/docker/docker-compose.1604.51.yaml b/docker/docker-compose.1604.51.yaml
index ab29c893..5a9cea06 100644
--- a/docker/docker-compose.1604.51.yaml
+++ b/docker/docker-compose.1604.51.yaml
@@ -11,6 +11,8 @@ services:
 
   test:
     image: swift-aws-lambda:16.04-5.1
+    environment:
+      - SANITIZER_ARG=--sanitize=thread
 
   shell:
     image: swift-aws-lambda:16.04-5.1
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index 788edd85..ea5eb7a3 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -28,7 +28,7 @@ services:
 
   test:
     <<: *common
-    command: /bin/bash -cl "swift test -Xswiftc -warnings-as-errors"
+    command: /bin/bash -cl "swift test -Xswiftc -warnings-as-errors $${SANITIZER_ARG-}"
 
   # util