diff --git a/xray/process.go b/xray/process.go
index f1a1400a..6be60ac6 100644
--- a/xray/process.go
+++ b/xray/process.go
@@ -436,10 +436,6 @@ func (p *process) Stop() error {
 }
 
 func (p *process) waitForExit(timeout time.Duration) error {
-	if p.done == nil {
-		return nil
-	}
-
 	timer := time.NewTimer(timeout)
 	defer timer.Stop()
 
diff --git a/xray/process_test.go b/xray/process_test.go
index e4b2689b..12d01500 100644
--- a/xray/process_test.go
+++ b/xray/process_test.go
@@ -24,7 +24,7 @@ func TestStopWaitsForGracefulExit(t *testing.T) {
 	if err := p.Stop(); err != nil {
 		t.Fatalf("Stop: %v", err)
 	}
-	if elapsed := time.Since(start); elapsed < 150*time.Millisecond {
+	if elapsed := time.Since(start); elapsed < 180*time.Millisecond {
 		t.Fatalf("Stop returned before child exited; elapsed=%s", elapsed)
 	}
 	if p.IsRunning() {
@@ -156,7 +156,7 @@ func markProcessHelperReady(t *testing.T) {
 	if readyPath == "" {
 		t.Fatal("XRAY_PROCESS_READY is not set")
 	}
-	if err := os.WriteFile(readyPath, []byte("ready"), 0644); err != nil {
+	if err := os.WriteFile(readyPath, []byte("ready"), 0o644); err != nil {
 		t.Fatalf("write helper ready file: %v", err)
 	}
 }