diff --git a/distribution_manifest.py b/distribution_manifest.py
index 46742e4f..0f6e915c 100644
--- a/distribution_manifest.py
+++ b/distribution_manifest.py
@@ -331,9 +331,8 @@
 psf_moffat_fwhm2_35x35.fits
 test_dump_mcmc2a
 test_dump_mcmc2b
-osx/oversampled_orig.fits
-osx/oversampled2both_orig.fits
-linux/oversampled_orig.fits
+oversampled_orig.fits
+oversampled2both_orig.fits
 mcmc_data/mcmc_test_short.1.txt
 mcmc_data/mcmc_test_short.2.txt
 mcmc_data/mcmc_test_short.3.txt
diff --git a/todo_and_bugs-to-fix.txt b/todo_and_bugs-to-fix.txt
index 7d5ae2e1..b961d5ef 100644
--- a/todo_and_bugs-to-fix.txt
+++ b/todo_and_bugs-to-fix.txt
@@ -34,7 +34,7 @@
 [ ] Unit tests for FerrersBar3D
 
 
-[ ] Fix image-comparison regression tests
+[X] Fix image-comparison regression tests
 	OK, the weird case is biggertest.fits, which has two (and only two) pixels
 	which differ by ~ 0.0167 between the Mac and Linux versions; all other
 	pixels appear to be identical. The discrepant pixels are at (x,y) = (31,23)
@@ -54,12 +54,17 @@
 	
 	All *other* files agree to w/in 1e-13
 	
-	[ ] Update compare_fits_files.py to use numpy.allclose
+	[X] Update compare_fits_files.py to use numpy.allclose
 		[X] Update to use np.allclose( rtol=0, atol=1e-12)
-		[ ] Test atol=1e-12 on existing Mac images
-			[ ] write Python or shell script to do image comparisons from
+		[X] Test atol=1e-12 on existing Mac images
+			[X] write Python or shell script to do image comparisons from
 				makeimage regression tests
-		[ ] Test atol=1e-12 on Linux images (on Mac)
+		[X] Convert do_makeimage_tests to use new function
+		[X] Test atol=1e-12 on Linux images (on Mac)
+		[X] Move osx/*.fits images up one level
+		[X] Rewrite do_makeimage_tests to skip the OS testing and subdirectory use
+	
+	[X] Add do_makeimage_tests to travis.yml
 
 
 [ ] 2D Ferrers bar model