diff --git a/jsv1/version1.go b/jsv1/version1.go
index 71e7975..72cb7fb 100644
--- a/jsv1/version1.go
+++ b/jsv1/version1.go
@@ -12,7 +12,8 @@ const lengthOfJavaScript = "17"
 func Write(w http.ResponseWriter, code int) {
 	w.Header().Set("Content-Type", "application/javascript")
 	w.Header().Set("Content-Length", lengthOfJavaScript)
-
+	// Note: All w.Header() modifications must be made BEFORE this call.
+	w.WriteHeader(code)
 	fmt.Fprintf(w, returnedJavaScript)
 }
 
diff --git a/pingv2_test.go b/pingv2_test.go
index 7acffb5..f7f92b5 100644
--- a/pingv2_test.go
+++ b/pingv2_test.go
@@ -108,10 +108,7 @@ func TestPingV2_Success(t *testing.T) {
 	handler := NewHandler([]string{"example.org"}, "")
 	handler.ServeHTTP(recorder, request)
 
-	if status := recorder.Code; status != http.StatusOK {
-		t.Errorf("handler returned wrong status code: got %v want %v",
-			status, http.StatusCreated)
-	}
+	assertStatusCode(t, recorder, http.StatusOK)
 
 	expected := "function logVisit"
 	if !strings.Contains(recorder.Body.String(), expected) {
@@ -339,10 +336,7 @@ func TestSubmitV2_Success_PreservesXForwardedForOverRemoteAddr(t *testing.T) {
 	handler := NewHandler([]string{"example.org"}, "")
 	handler.ServeHTTP(recorder, request)
 
-	if status := recorder.Code; status != http.StatusCreated {
-		t.Errorf("handler returned wrong status code: got %v want %v",
-			status, http.StatusCreated)
-	}
+	assertStatusCode(t, recorder, http.StatusCreated)
 
 	expected := "(function(){})();"
 	if recorder.Body.String() != expected {