@@ -918,45 +918,34 @@ def test_proper_error_raised_on_non_fits_file_with_unicode(self):
     # Avoid a spurious pyflakes warning about an unused import
     # of six by adding a reason string
     @pytest.mark.skipif(six.PY2, reason='six.PY2')
-    @pytest.mark.parametrize(('ignore', ), [(False, ), (True, )])
-    def test_no_resource_warning_raised_on_non_fits_file(self, ignore):
+    @pytest.mark.parametrize('ignore', [False, True])
+    @pytest.mark.parametrize('fileobj', [False, True])
+    def test_no_resource_warning_raised_on_non_fits_file(self, ignore, fileobj):
         """
         Regression test for https://github.com/astropy/astropy/issues/6168
 
         The ResourceWarning shows up when (in python 3+) you try to
-        open a non-FITS file.
+        open a non-FITS file when using a filename.
         """
+
         filename = self.temp('not-fits.fits')
         with open(filename, mode='w') as f:
             f.write('# header line\n')
             f.write('0.1 0.2\n')
 
         # This should raise an IOError because there is no end card.
         with catch_warnings(ResourceWarning) as ws:
-            with pytest.raises(IOError):
-                fits.open(filename, ignore_missing_end=ignore)
-
-        assert len(ws) == 0
-
-    @pytest.mark.skipif(six.PY2, reason='six.PY2')
-    def test_no_resource_warning_raised_on_non_fits_file_as_fileobj(self):
-        """
-        Regression test for https://github.com/astropy/astropy/issues/6168
 
-        This is to check that the file is not closed when a file object
-        is sent in to fits.open.
-        """
-        filename = self.temp('not-fits.fits')
-        with open(filename, mode='w') as f:
-            f.write('# header line\n')
-            f.write('0.1 0.2\n')
+            if fileobj:
+                # Make sure that files opened by the user are not closed
+                with open(filename, mode='rb') as f:
+                    with pytest.raises(OSError):
+                        fits.open(f, ignore_missing_end=ignore)
 
-        # This should raise an IOError because there is no end card.
-        with catch_warnings(ResourceWarning) as ws:
-            with open(filename, mode='rb') as f:
-                with pytest.raises(IOError):
-                    fits.open(f)
+                    assert not f.closed
 
-                assert not f.closed
+            else:
+                with pytest.raises(OSError):
+                    fits.open(filename, ignore_missing_end=ignore)
 
         assert len(ws) == 0