diff --git a/src/include/deepstate/DeepState.h b/src/include/deepstate/DeepState.h
index 51c3cee..2de5644 100644
--- a/src/include/deepstate/DeepState.h
+++ b/src/include/deepstate/DeepState.h
@@ -66,7 +66,7 @@ DECLARE_bool(abort_on_fail);
 DECLARE_bool(verbose_reads);
 DECLARE_bool(fuzz);
 DECLARE_bool(fuzz_save_passing);
-DECLARE_bool(no_fork);
+DECLARE_bool(fork);
 
 DECLARE_int(log_level);
 DECLARE_int(seed);
@@ -579,14 +579,14 @@ static int DeepState_RunTestNoFork(struct DeepState_TestInfo *test) {
 static enum DeepState_TestRunResult
 DeepState_ForkAndRunTest(struct DeepState_TestInfo *test) {
   pid_t test_pid;
-  if (!FLAGS_no_fork) {
+  if (FLAGS_fork) {
     test_pid = fork();
     if (!test_pid) {
       DeepState_RunTest(test);
     }
   }
-  int wstatus;
-  if (!FLAGS_no_fork) {
+  int wstatus = 0;
+  if (FLAGS_fork) {
     waitpid(test_pid, &wstatus, 0);
   } else {
     wstatus = DeepState_RunTestNoFork(test);
diff --git a/src/lib/DeepState.c b/src/lib/DeepState.c
index cfd1657..2871ecb 100644
--- a/src/lib/DeepState.c
+++ b/src/lib/DeepState.c
@@ -39,7 +39,7 @@ DEFINE_bool(abort_on_fail, false, "Abort on file replay failure (useful in file
 DEFINE_bool(verbose_reads, false, "Report on bytes being read during execution of test.");
 DEFINE_bool(fuzz, false, "Perform brute force unguided fuzzing.");
 DEFINE_bool(fuzz_save_passing, false, "Save passing tests during fuzzing.");
-DEFINE_bool(no_fork, false, "Don't fork when running a test.");
+DEFINE_bool(fork, true, "Fork when running a test.");
 
 DEFINE_int(log_level, 0, "Minimum level of logging to output.");
 DEFINE_int(seed, 0, "Seed for brute force fuzzing (uses time if not set).");