diff --git a/openmc/data/neutron.py b/openmc/data/neutron.py
index 8d59316892..4f02af1a48 100644
--- a/openmc/data/neutron.py
+++ b/openmc/data/neutron.py
@@ -840,10 +840,7 @@ class IncidentNeutron(EqualityMixin):
             Incident neutron continuous-energy data
 
         """
-        # Create temporary directory -- it would be preferable to use
-        # TemporaryDirectory(), but it is only available in Python 3.2
-        tmpdir = tempfile.mkdtemp()
-        try:
+        with tempfile.TemporaryDirectory() as tmpdir:
             # Run NJOY to create an ACE library
             ace_file = os.path.join(tmpdir, 'ace')
             xsdir_file = os.path.join(tmpdir, 'xsdir')
@@ -871,8 +868,4 @@ class IncidentNeutron(EqualityMixin):
                 data.energy['0K'] = xs.x
                 data[2].xs['0K'] = xs
 
-        finally:
-            # Get rid of temporary files
-            shutil.rmtree(tmpdir)
-
         return data
diff --git a/openmc/data/njoy.py b/openmc/data/njoy.py
index be16d96f81..b2894b3d1c 100644
--- a/openmc/data/njoy.py
+++ b/openmc/data/njoy.py
@@ -149,10 +149,7 @@ def run(commands, tapein, tapeout, input_filename=None, stdout=False,
         with open(input_filename, 'w') as f:
             f.write(commands)
 
-    # Create temporary directory -- it would be preferable to use
-    # TemporaryDirectory(), but it is only available in Python 3.2
-    tmpdir = tempfile.mkdtemp()
-    try:
+    with tempfile.TemporaryDirectory() as tmpdir:
         # Copy evaluations to appropriates 'tapes'
         for tape_num, filename in tapein.items():
             tmpfilename = os.path.join(tmpdir, 'tape{}'.format(tape_num))
@@ -186,8 +183,6 @@ def run(commands, tapein, tapeout, input_filename=None, stdout=False,
             tmpfilename = os.path.join(tmpdir, 'tape{}'.format(tape_num))
             if os.path.isfile(tmpfilename):
                 shutil.move(tmpfilename, filename)
-    finally:
-        shutil.rmtree(tmpdir)
 
 
 def make_pendf(filename, pendf='pendf', error=0.001, stdout=False):
diff --git a/openmc/data/thermal.py b/openmc/data/thermal.py
index 68192de039..4f89d8e834 100644
--- a/openmc/data/thermal.py
+++ b/openmc/data/thermal.py
@@ -623,10 +623,7 @@ class ThermalScattering(EqualityMixin):
             Thermal scattering data
 
         """
-        # Create temporary directory -- it would be preferable to use
-        # TemporaryDirectory(), but it is only available in Python 3.2
-        tmpdir = tempfile.mkdtemp()
-        try:
+        with tempfile.TemporaryDirectory() as tmpdir:
             # Run NJOY to create an ACE library
             ace_file = os.path.join(tmpdir, 'ace')
             xsdir_file = os.path.join(tmpdir, 'xsdir')
@@ -638,8 +635,5 @@ class ThermalScattering(EqualityMixin):
             data = cls.from_ace(lib.tables[0])
             for table in lib.tables[1:]:
                 data.add_temperature_from_ace(table)
-        finally:
-            # Get rid of temporary files
-            shutil.rmtree(tmpdir)
 
         return data