diff --git a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.partial-content/a.size b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.partial-content/a.size
index 10b907508c..13d0c3c958 100644
--- a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.partial-content/a.size
+++ b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.partial-content/a.size
@@ -1 +1 @@
-  555523 7gZBKVUgy4l-file0
+555523 7gZBKVUgy4l-file0
diff --git a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.partial-content/b.size b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.partial-content/b.size
index d4ade48a31..c1c1d71db7 100644
--- a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.partial-content/b.size
+++ b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.partial-content/b.size
@@ -1 +1 @@
- 1022920 oDwT1BbzjM1-file0
+1022920 oDwT1BbzjM1-file0
diff --git a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.partial-content/c.size b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.partial-content/c.size
index 88415185cd..da0f4d480c 100644
--- a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.partial-content/c.size
+++ b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.partial-content/c.size
@@ -1 +1 @@
-  498668 uHS14uhRKGe-file0
+498668 uHS14uhRKGe-file0
diff --git a/testing/btest/Baseline/scripts.base.frameworks.logging.dataseries.wikipedia/http.ds.txt b/testing/btest/Baseline/scripts.base.frameworks.logging.dataseries.wikipedia/http.ds.txt
index bea50e6aba..bcfad8fd80 100644
--- a/testing/btest/Baseline/scripts.base.frameworks.logging.dataseries.wikipedia/http.ds.txt
+++ b/testing/btest/Baseline/scripts.base.frameworks.logging.dataseries.wikipedia/http.ds.txt
@@ -61,7 +61,7 @@
 <!-- proxied : table[string] -->
 <!-- mime_type : string -->
 <!-- md5 : string -->
-<!-- extraction_file : file -->
+<!-- extraction_file : string -->
 
 # Extent, type='http'
 ts uid id.orig_h id.orig_p id.resp_h id.resp_p trans_depth method host uri referrer user_agent request_body_len response_body_len status_code status_msg info_code info_msg filename tags username password proxied mime_type md5 extraction_file
diff --git a/testing/btest/scripts/base/frameworks/file-analysis/http/partial-content.bro b/testing/btest/scripts/base/frameworks/file-analysis/http/partial-content.bro
index 9361184881..6773c6aa11 100644
--- a/testing/btest/scripts/base/frameworks/file-analysis/http/partial-content.bro
+++ b/testing/btest/scripts/base/frameworks/file-analysis/http/partial-content.bro
@@ -1,16 +1,16 @@
 # @TEST-EXEC: bro -r $TRACES/http/206_example_a.pcap $SCRIPTS/file-analysis-test.bro %INPUT >a.out
 # @TEST-EXEC: btest-diff a.out
-# @TEST-EXEC: wc -c 7gZBKVUgy4l-file0 >a.size
+# @TEST-EXEC: wc -c 7gZBKVUgy4l-file0 | sed 's/^[ \t]* //g' >a.size
 # @TEST-EXEC: btest-diff a.size
 
 # @TEST-EXEC: bro -r $TRACES/http/206_example_b.pcap $SCRIPTS/file-analysis-test.bro %INPUT >b.out
 # @TEST-EXEC: btest-diff b.out
-# @TEST-EXEC: wc -c oDwT1BbzjM1-file0 >b.size
+# @TEST-EXEC: wc -c oDwT1BbzjM1-file0 | sed 's/^[ \t]* //g' >b.size
 # @TEST-EXEC: btest-diff b.size
 
 # @TEST-EXEC: bro -r $TRACES/http/206_example_c.pcap $SCRIPTS/file-analysis-test.bro %INPUT >c.out
 # @TEST-EXEC: btest-diff c.out
-# @TEST-EXEC: wc -c uHS14uhRKGe-file0 >c.size
+# @TEST-EXEC: wc -c uHS14uhRKGe-file0 | sed 's/^[ \t]* //g' >c.size
 # @TEST-EXEC: btest-diff c.size
 
 global cnt: count = 0;
diff --git a/testing/scripts/diff-canonifier b/testing/scripts/diff-canonifier
index 3cb213a3f7..aef9173cc8 100755
--- a/testing/scripts/diff-canonifier
+++ b/testing/scripts/diff-canonifier
@@ -2,4 +2,5 @@
 #
 # Default canonifier used with the tests in testing/btest/*.
 
-`dirname $0`/diff-remove-timestamps
+`dirname $0`/diff-remove-timestamps \
+    | `dirname $0`/diff-remove-mime-types
diff --git a/testing/scripts/file-analysis-test.bro b/testing/scripts/file-analysis-test.bro
index 2e1d107ffb..a52a8ec29b 100644
--- a/testing/scripts/file-analysis-test.bro
+++ b/testing/scripts/file-analysis-test.bro
@@ -76,13 +76,16 @@ hook FileAnalysis::policy(trig: FileAnalysis::Trigger, info: FileAnalysis::Info)
 		for ( act in info$actions )
 			switch ( act$act ) {
 			case FileAnalysis::ACTION_MD5:
-				print fmt("MD5: %s", info$actions[act]$md5);
+				if ( info$actions[act]?$md5 )
+					print fmt("MD5: %s", info$actions[act]$md5);
 				break;
 			case FileAnalysis::ACTION_SHA1:
-				print fmt("SHA1: %s", info$actions[act]$sha1);
+				if ( info$actions[act]?$sha1 )
+					print fmt("SHA1: %s", info$actions[act]$sha1);
 				break;
 			case FileAnalysis::ACTION_SHA256:
-				print fmt("SHA256: %s", info$actions[act]$sha256);
+				if ( info$actions[act]?$sha256 )
+					print fmt("SHA256: %s", info$actions[act]$sha256);
 				break;
 			}
 		break;