diff --git a/tests/test_layered_image.py b/tests/test_layered_image.py
index 5d7cf43c..334233e4 100644
--- a/tests/test_layered_image.py
+++ b/tests/test_layered_image.py
@@ -79,23 +79,23 @@ def test_convolve_psf(self):
         msk0 = self.image.get_mask()
 
         # Create a copy of the image.
-        img_b = layered_image(sci, var, mask, self.p)
+        img_b = layered_image(sci0, var0, msk0, self.p)
 
         # A no-op PSF does not change the image.
         img_b.convolve_given_psf(psf())
         sci1 = img_b.get_science()
         var1 = img_b.get_variance()
-        for y in range(img2.get_height()):
-            for x in range(img2.get_width()):
+        for y in range(img_b.get_height()):
+            for x in range(img_b.get_width()):
                 self.assertAlmostEqual(sci0.get_pixel(x, y), sci1.get_pixel(x, y))
                 self.assertAlmostEqual(var0.get_pixel(x, y), var1.get_pixel(x, y))
 
         # The default PSF (stdev=1.0) DOES have the image.
-        img_b.convolve_psf(psf())
+        img_b.convolve_psf()
         sci1 = img_b.get_science()
         var1 = img_b.get_variance()
-        for y in range(img2.get_height()):
-            for x in range(img2.get_width()):
+        for y in range(img_b.get_height()):
+            for x in range(img_b.get_width()):
                 self.assertNotAlmostEqual(sci0.get_pixel(x, y), sci1.get_pixel(x, y))
                 self.assertNotAlmostEqual(var0.get_pixel(x, y), var1.get_pixel(x, y))
 
diff --git a/tests/test_psf.py b/tests/test_psf.py
index 01e2aee0..4d088c90 100644
--- a/tests/test_psf.py
+++ b/tests/test_psf.py
@@ -11,9 +11,9 @@ def setUp(self):
 
     def test_make_noop(self):
         psf0 = psf()
-        self.assertEqual(psf1.get_size(), 1)
-        self.assertEqual(psf1.get_dim(), 1)
-        self.assertEqual(psf1.get_radius(), 0)
+        self.assertEqual(psf0.get_size(), 1)
+        self.assertEqual(psf0.get_dim(), 1)
+        self.assertEqual(psf0.get_radius(), 0)
 
         kernel0 = psf0.get_kernel()
         self.assertEqual(len(kernel0), 1)