diff --git a/core/process.py b/core/process.py
index 6c2bdd44f9..11b5b642de 100644
--- a/core/process.py
+++ b/core/process.py
@@ -1445,6 +1445,7 @@ def WaitForOne(self):
       # running.  Not sure if there's any real difference.  bash and dash
       # handle SIGINT pretty differently.
       if self.exec_opts.interactive():
+        # TODO: fix status=130 bug here
         # Caller should keep waiting.  If we run 'sleep 3' and hit Ctrl-C, both
         # processes will get SIGINT, but the shell has to wait again to get the
         # exit code.
diff --git a/soil/worker.sh b/soil/worker.sh
index 5c72a48202..d1e3eb75a9 100755
--- a/soil/worker.sh
+++ b/soil/worker.sh
@@ -109,7 +109,7 @@ lint                test/lint.sh soil-run            -
 typecheck-slice     types/oil-slice.sh soil-run      -
 typecheck-other     types/run.sh soil-run            -
 unit                test/unit.sh soil-run            -
-interactive         test/interactive.sh soil-run     -
+stateful            test/stateful.sh soil-run     -
 parse-errors        test/parse-errors.sh soil-run-py             -
 runtime-errors      test/runtime-errors.sh run-all-with-osh      -
 oil-runtime-errors  test/oil-runtime-errors.sh run-all-with-osh  -
diff --git a/test/interactive.py b/spec/stateful/harness.py
similarity index 100%
rename from test/interactive.py
rename to spec/stateful/harness.py
diff --git a/test/interactive.sh b/test/stateful.sh
similarity index 85%
rename from test/interactive.sh
rename to test/stateful.sh
index decd30c812..c5fd713803 100755
--- a/test/interactive.sh
+++ b/test/stateful.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Wrapper for test/interactive.py
+# Wrapper for test cases in spec/stateful
 #
 # Usage:
 #   test/interactive.sh <function name>
@@ -14,7 +14,7 @@ export PYTHONPATH=.
 run() {
   ### Wrapper for PYTHONPATH
 
-  test/interactive.py "$@"
+  spec/stateful/harness.py "$@"
 
 }
 
@@ -24,7 +24,7 @@ all() {
   ### Run all tests
 
   # TODO: source build/dev-shell.sh to change $PATH?
-  test/interactive.py --osh-failures-allowed $FAILURES_ALLOWED \
+  spec/stateful/harness.py --osh-failures-allowed $FAILURES_ALLOWED \
     bin/osh ../oil_DEPS/spec-bin/bash "$@"
 }
 
@@ -34,7 +34,7 @@ all-dev-minimal() {
   # This is a hack for the 'dev-minimal' task in Soil.  We don't have spec-bin,
   # and the ovm-tarball container doesn't have python3 :-( Really we should
   # build another container, but this is OK for now.
-  test/interactive.py --osh-failures-allowed $FAILURES_ALLOWED \
+  spec/stateful/harness.py --osh-failures-allowed $FAILURES_ALLOWED \
     bin/osh bash "$@"
 }