diff --git a/tests/regression_tests/eigenvalue_genperbatch/geometry.xml b/tests/regression_tests/eigenvalue_genperbatch/geometry.xml
deleted file mode 100644
index bc56030e18..0000000000
--- a/tests/regression_tests/eigenvalue_genperbatch/geometry.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
- |
-
-
diff --git a/tests/regression_tests/eigenvalue_genperbatch/inputs_true.dat b/tests/regression_tests/eigenvalue_genperbatch/inputs_true.dat
new file mode 100644
index 0000000000..dabd743c1d
--- /dev/null
+++ b/tests/regression_tests/eigenvalue_genperbatch/inputs_true.dat
@@ -0,0 +1,25 @@
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+ eigenvalue
+ 1000
+ 7
+ 3
+ 3
+
+
+ -4.0 -4.0 -4.0 4.0 4.0 4.0
+
+
+
diff --git a/tests/regression_tests/eigenvalue_genperbatch/materials.xml b/tests/regression_tests/eigenvalue_genperbatch/materials.xml
deleted file mode 100644
index 2472a74717..0000000000
--- a/tests/regression_tests/eigenvalue_genperbatch/materials.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/tests/regression_tests/eigenvalue_genperbatch/settings.xml b/tests/regression_tests/eigenvalue_genperbatch/settings.xml
deleted file mode 100644
index fefc2d059a..0000000000
--- a/tests/regression_tests/eigenvalue_genperbatch/settings.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
- eigenvalue
- 7
- 3
- 1000
- 3
-
-
-
- -4 -4 -4 4 4 4
-
-
-
-
diff --git a/tests/regression_tests/eigenvalue_genperbatch/test.py b/tests/regression_tests/eigenvalue_genperbatch/test.py
index 0dfb112428..5497c37d29 100644
--- a/tests/regression_tests/eigenvalue_genperbatch/test.py
+++ b/tests/regression_tests/eigenvalue_genperbatch/test.py
@@ -1,6 +1,32 @@
-from tests.testing_harness import TestHarness
+import openmc
+import pytest
+
+from tests.testing_harness import PyAPITestHarness
-def test_eigenvalue_genperbatch():
- harness = TestHarness('statepoint.7.h5')
+@pytest.fixture
+def model():
+ model = openmc.model.Model()
+
+ m = openmc.Material()
+ m.set_density('g/cm3', 4.5)
+ m.add_nuclide('U235', 1.0)
+ model.materials.append(m)
+
+ sph = openmc.Sphere(r=10.0, boundary_type='vacuum')
+ c = openmc.Cell(fill=m, region=-sph)
+ model.geometry = openmc.Geometry([c])
+
+ model.settings.particles = 1000
+ model.settings.inactive = 3
+ model.settings.batches = 7
+ model.settings.generations_per_batch = 3
+ space = openmc.stats.Box((-4.0, -4.0, -4.0), (4.0, 4.0, 4.))
+ model.settings.source = openmc.Source(space=space)
+
+ return model
+
+
+def test_eigenvalue_genperbatch(model):
+ harness = PyAPITestHarness('statepoint.7.h5', model)
harness.main()