diff --git a/.travis.yml b/.travis.yml
index c69d01606542..afbb71181f46 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,10 @@ matrix:
     - os: linux
       dist: trusty
       sudo: required
+    - os: linux
+      dist: trusty
+      sudo: required
+      env: ENABLE_RACE=1
     - os: linux
       dist: trusty
       sudo: false
@@ -28,7 +32,10 @@ matrix:
     - os: osx
       osx_image: xcode9.1
   allow_failures:
+    # Allow osx to fail as its flaky
     - os: osx
+    #FIXME Allow race enabled builds to fail for now.
+    - env: ENABLE_RACE=1
   fast_finish: true
 
 before_install:
diff --git a/GNUmakefile b/GNUmakefile
index 26be2e1cab23..53b7b6a7e00a 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -244,10 +244,11 @@ test: ## Run the Nomad test suite and/or the Nomad UI test suite
 .PHONY: test-nomad
 test-nomad: dev ## Run Nomad test suites
 	@echo "==> Running Nomad test suites:"
-	@go test $(if $(VERBOSE),-v) \
-			-cover \
-			-timeout=900s \
-			-tags="$(if $(HAS_LXC),lxc)" ./... $(if $(VERBOSE), >test.log ; echo $$? > exit-code)
+	$(if $(ENABLE_RACE),GORACE="strip_path_prefix=$(GOPATH)/src") go test \
+		$(if $(ENABLE_RACE),-race) $(if $(VERBOSE),-v) \
+		-cover \
+		-timeout=900s \
+		-tags="$(if $(HAS_LXC),lxc)" ./... $(if $(VERBOSE), >test.log ; echo $$? > exit-code)
 	@if [ $(VERBOSE) ] ; then \
 		bash -C "$(PROJECT_ROOT)/scripts/test_check.sh" ; \
 	fi