diff --git a/Makefile b/Makefile
index ee04cbef3af..b74c6f371d5 100644
--- a/Makefile
+++ b/Makefile
@@ -80,6 +80,10 @@ unit_test: build
 unit_test_cover: build
 	go test $(VT_GO_PARALLEL) -cover ./go/... | misc/parse_cover.py
 
+# TODO(mberlin): This is currently disabled in test/config.json for automatic
+# runs on Travis (manual=false). Re-enable it there once we switched the Travis
+# tests to using Docker and we verified that this is no longer flaky e.g. in
+# doubt increase timeouts in all tests.
 unit_test_race: build
 	tools/unit_test_race.sh
 
diff --git a/test/config.json b/test/config.json
index b5173941c8c..634c9531ddc 100644
--- a/test/config.json
+++ b/test/config.json
@@ -371,7 +371,7 @@
 				"make",
 				"unit_test_race"
 			],
-			"Manual": false,
+			"Manual": true,
 			"Shard": 0,
 			"RetryMax": 0,
 			"Tags": []