diff --git a/docs/source/usersguide/scripts.rst b/docs/source/usersguide/scripts.rst
index 388130947c..c361ebe435 100644
--- a/docs/source/usersguide/scripts.rst
+++ b/docs/source/usersguide/scripts.rst
@@ -33,6 +33,7 @@ working directory which may be different from
 flags:
 
 -c, --volume           Run in stochastic volume calculation mode
+-e, --event            Run using event-based parallelism
 -g, --geometry-debug   Run in geometry debugging mode, where cell overlaps are
                        checked for after each move of a particle
 -n, --particles N      Use *N* particles per generation or batch
diff --git a/man/man1/openmc.1 b/man/man1/openmc.1
index 168fab6861..1b2443c90a 100644
--- a/man/man1/openmc.1
+++ b/man/man1/openmc.1
@@ -16,6 +16,9 @@ is specified, the XML input files are present in the current directory.
 .B "\-c\fR, \fP\-\-volume"
 Run in stochastic volume calculation mode
 .TP
+.B "\-e\fR, \fP\-\-event"
+Run using event-based parallelism
+.TP
 .B "\-g\fR, \fP\-\-geometry-debug"
 Run with geometry debugging turned on, where cell overlaps are checked for after
 each move of a particle
diff --git a/src/finalize.cpp b/src/finalize.cpp
index d2831c860e..74f02cc64c 100644
--- a/src/finalize.cpp
+++ b/src/finalize.cpp
@@ -80,7 +80,9 @@ int openmc_finalize()
   settings::gen_per_batch = 1;
   settings::legendre_to_tabular = true;
   settings::legendre_to_tabular_points = -1;
+  settings::event_based = false;
   settings::material_cell_offsets = true;
+  settings::max_particles_in_flight = 100000;
   settings::n_particles = -1;
   settings::output_summary = true;
   settings::output_tallies = true;
diff --git a/src/settings.cpp b/src/settings.cpp
index 8251a39dc4..32a7958d8d 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -46,6 +46,7 @@ bool create_fission_neutrons {true};
 bool dagmc                   {false};
 bool delayed_photon_scaling  {true};
 bool entropy_on              {false};
+bool event_based             {false};
 bool legendre_to_tabular     {true};
 bool material_cell_offsets   {true};
 bool output_summary          {true};
@@ -67,7 +68,6 @@ bool ufs_on                  {false};
 bool urr_ptables_on          {true};
 bool write_all_tracks        {false};
 bool write_initial_source    {false};
-bool event_based             {false};
 
 std::string path_cross_sections;
 std::string path_input;
diff --git a/tests/regression_tests/__init__.py b/tests/regression_tests/__init__.py
index 965a7f94db..dcbac5447a 100644
--- a/tests/regression_tests/__init__.py
+++ b/tests/regression_tests/__init__.py
@@ -1,5 +1,6 @@
 # Test configuration options for regression tests
 config = {
+    'event' : False
     'exe': 'openmc',
     'mpi': False,
     'mpiexec': 'mpiexec',
diff --git a/tests/testing_harness.py b/tests/testing_harness.py
index 5bd030a816..d5484d73e9 100644
--- a/tests/testing_harness.py
+++ b/tests/testing_harness.py
@@ -66,16 +66,12 @@ class TestHarness(object):
             self._cleanup()
 
     def _run_openmc(self):
-        if config['mpi'] and not config['event']:
+        if config['mpi']:
             mpi_args = [config['mpiexec'], '-n', config['mpi_np']]
-            openmc.run(openmc_exec=config['exe'], mpi_args=mpi_args)
-        elif config['mpi'] and config['event']:
-            mpi_args = [config['mpiexec'], '-n', config['mpi_np']]
-            openmc.run(openmc_exec=config['exe'], mpi_args=mpi_args, event_based=True)
-        elif config['event']:
-            openmc.run(openmc_exec=config['exe'], event_based=True)
+            openmc.run(openmc_exec=config['exe'], mpi_args=mpi_args,
+              event_based=config['event'])
         else:
-            openmc.run(openmc_exec=config['exe'])
+            openmc.run(openmc_exec=config['exe'], event_based=config['event'])
 
     def _test_output_created(self):
         """Make sure statepoint.* and tallies.out have been created."""