diff --git a/Makefile b/Makefile
index 4dfb117b9..b7a88ab6d 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ BUILD_HOST_VAR = github.com/letsencrypt/boulder/core.BuildHost
 BUILD_TIME = $(shell date -u)
 BUILD_TIME_VAR = github.com/letsencrypt/boulder/core.BuildTime
 
-GO_BUILD_FLAGS = -ldflags "-X \"$(BUILD_ID_VAR)=$(BUILD_ID)\" -X \"$(BUILD_TIME_VAR)=$(BUILD_TIME)\" -X \"$(BUILD_HOST_VAR)=$(BUILD_HOST)\""
+GO_BUILD_FLAGS = -ldflags "-X \"$(BUILD_ID_VAR)=$(BUILD_ID)\" -X \"$(BUILD_TIME_VAR)=$(BUILD_TIME)\" -X \"$(BUILD_HOST_VAR)=$(BUILD_HOST)\"" -tags std_json
 
 .PHONY: all build
 all: build
diff --git a/test/startservers.py b/test/startservers.py
index 51d933486..054e0fd3e 100644
--- a/test/startservers.py
+++ b/test/startservers.py
@@ -38,7 +38,7 @@ def install(race_detection):
     # BUILD_ID.
     cmd = "make GO_BUILD_FLAGS=''  "
     if race_detection:
-        cmd = "make GO_BUILD_FLAGS='-race -tags integration'"
+        cmd = "make GO_BUILD_FLAGS='-race -tags \"std_json integration\"'"
 
     return subprocess.call(cmd, shell=True) == 0