diff --git a/prism/etc/scripts/prism-auto b/prism/etc/scripts/prism-auto
index fd6ff55a..4df5c4f5 100755
--- a/prism/etc/scripts/prism-auto
+++ b/prism/etc/scripts/prism-auto
@@ -355,7 +355,10 @@ def verifyAndCleanupExports(outFiles, exportPrefix):
     	print "Testing export " + os.path.basename(outFile) + ":",
         expFile = prependToFile(exportPrefix, outFile)
         if os.path.isfile(expFile):
-            if filecmp.cmp(outFile, expFile):
+            if options.noExportTests:
+                print "SKIPPED"
+                os.remove(expFile)
+            elif filecmp.cmp(outFile, expFile):
                 # If successful, notify and delete exported file
                 print "PASS"
                 os.remove(expFile)
@@ -602,6 +605,7 @@ parser.add_option("--no-renaming", action="store_true", dest="noRenaming", defau
 parser.add_option("--debug", action="store_true", dest="debug", default=False, help="Enable debug mode: display debugging info")
 parser.add_option("--echo-full", action="store_true", dest="echoFull", default=False, help="An expanded version of -e/--echo")
 parser.add_option("--models-filename", dest="modelsFilename", default="models", help="The name of the optional 'models' file in directories, storing a list of models and parameters [default=models]")
+parser.add_option("--no-export-tests", action="store_true", dest="noExportTests", default=False, help="Don't check exported files when in test mode")
 (options, args) = parser.parse_args()
 if len(args) < 1:
     parser.print_help()