diff --git a/cmd/state-svc/main.go b/cmd/state-svc/main.go
index 779944601b..0563b3510b 100644
--- a/cmd/state-svc/main.go
+++ b/cmd/state-svc/main.go
@@ -55,7 +55,7 @@ func main() {
 		}
 
 		if err := events.WaitForEvents(5*time.Second, rollbar.Wait, authentication.LegacyClose, logging.Close); err != nil {
-			fmt.Fprintf(os.Stderr, "Warning: failed to wait for events")
+			//fmt.Fprintf(os.Stderr, "Warning: failed to wait for events")
 		}
 		os.Exit(exitCode)
 	}()
diff --git a/cmd/state-svc/test/integration/svc_int_test.go b/cmd/state-svc/test/integration/svc_int_test.go
index d00cfa25f6..cb182b60de 100644
--- a/cmd/state-svc/test/integration/svc_int_test.go
+++ b/cmd/state-svc/test/integration/svc_int_test.go
@@ -157,9 +157,15 @@ func (suite *SvcIntegrationTestSuite) TestStartDuplicateErrorOutput() {
 func (suite *SvcIntegrationTestSuite) TestSingleSvc() {
 	suite.OnlyRunForTags(tagsuite.Service)
 	ts := e2e.New(suite.T(), false)
-	// TODO: CP-1268 should remove this conditional.
-	if runtime.GOOS != "windows" || !condition.OnCI() {
+	// TODO: CP-1268 should remove this conditional and just keep the defer.
+	//if runtime.GOOS != "windows" || !condition.OnCI() {
 		defer ts.Close()
+	//} else {
+	//	defer func() {
+	//		cp := ts.SpawnCmd(ts.SvcExe, "stop")
+	//		time.Sleep(500 * time.Millisecond)
+	//		cp.SendCtrlC() // if this ends up as a foreground process, then try to halt it
+	//	}()
 	}
 
 	ts.SpawnCmdWithOpts(ts.SvcExe, e2e.OptArgs("stop"))