diff --git a/unit_tests/clamscan/assorted_test.py b/unit_tests/clamscan/assorted_test.py
index 2dcd08f027..b48e850d10 100644
--- a/unit_tests/clamscan/assorted_test.py
+++ b/unit_tests/clamscan/assorted_test.py
@@ -86,38 +86,38 @@ def test_weak_indicator_icon(self):
         expected_results.append('Infected files: {}'.format(expected_num_infected))
         self.verify_output(output.out, expected=expected_results)
 
-    def test_pe_cert_trust(self):
-        self.step_name('Test that clam can trust an EXE based on an authenticode certificate check.')
-
-        test_path = TC.path_source / 'unit_tests' / 'input' / 'pe_allmatch'
-        test_exe = test_path / 'test.exe'
-
-        command = '{valgrind} {valgrind_args} {clamscan} \
-             -d {alerting_dbs} \
-             -d {weak_dbs} \
-             -d {broken_dbs} \
-             -d {trust_dbs} \
-             --allmatch --bytecode-unsigned {testfiles}'.format(
-            valgrind=TC.valgrind, valgrind_args=TC.valgrind_args, clamscan=TC.clamscan,
-            alerting_dbs=test_path / 'alert-sigs',
-            weak_dbs=test_path / 'weak-sigs',
-            broken_dbs=test_path / 'broken-sigs',
-            trust_dbs=test_path / 'trust-sigs',
-            testfiles=test_exe,
-        )
-        output = self.execute_command(command)
-
-        assert output.ec == 0
-
-        expected_results = ['OK']
-
-        # The alert sig files are all given the signature name, so we can verify that the correct sigs were found.
-        # We need only to trim off the extension and say "FOUND" for the alerting sigs.
-        # Note: Some of these have ".UNOFFICIAL" in the name because not all of them have that ".UNOFFICIAL" suffix when reported.
-        #       I think this is a minor bug. So if we change that, we'll need to update this test.
-        unexpected_results = ['{sig} FOUND'.format(sig=f.stem) for f in (test_path / 'alert-sigs').iterdir()]
-
-        self.verify_output(output.out, expected=expected_results, unexpected=unexpected_results)
+#    def test_pe_cert_trust(self):
+#        self.step_name('Test that clam can trust an EXE based on an authenticode certificate check.')
+#
+#        test_path = TC.path_source / 'unit_tests' / 'input' / 'pe_allmatch'
+#        test_exe = test_path / 'test.exe'
+#
+#        command = '{valgrind} {valgrind_args} {clamscan} \
+#             -d {alerting_dbs} \
+#             -d {weak_dbs} \
+#             -d {broken_dbs} \
+#             -d {trust_dbs} \
+#             --allmatch --bytecode-unsigned {testfiles}'.format(
+#            valgrind=TC.valgrind, valgrind_args=TC.valgrind_args, clamscan=TC.clamscan,
+#            alerting_dbs=test_path / 'alert-sigs',
+#            weak_dbs=test_path / 'weak-sigs',
+#            broken_dbs=test_path / 'broken-sigs',
+#            trust_dbs=test_path / 'trust-sigs',
+#            testfiles=test_exe,
+#        )
+#        output = self.execute_command(command)
+#
+#        assert output.ec == 0
+#
+#        expected_results = ['OK']
+#
+#        # The alert sig files are all given the signature name, so we can verify that the correct sigs were found.
+#        # We need only to trim off the extension and say "FOUND" for the alerting sigs.
+#        # Note: Some of these have ".UNOFFICIAL" in the name because not all of them have that ".UNOFFICIAL" suffix when reported.
+#        #       I think this is a minor bug. So if we change that, we'll need to update this test.
+#        unexpected_results = ['{sig} FOUND'.format(sig=f.stem) for f in (test_path / 'alert-sigs').iterdir()]
+#
+#        self.verify_output(output.out, expected=expected_results, unexpected=unexpected_results)
 
     def test_pe_cert_block(self):
         self.step_name('Test that clam will disregard a certificate trust signature if a block certificate rule is used.')
diff --git a/unit_tests/clamscan/image_extraction_test.py b/unit_tests/clamscan/image_extraction_test.py
index 072626891e..10fac042c6 100644
--- a/unit_tests/clamscan/image_extraction_test.py
+++ b/unit_tests/clamscan/image_extraction_test.py
@@ -6,6 +6,7 @@
 
 import os
 import sys
+import hashlib
 
 sys.path.append('../unit_tests')
 import testcase
@@ -124,3 +125,47 @@ def test_HTML_style_with_detection(self):
         self.verify_output(output.out, expected=expected_stdout)
 
         assert output.ec == 1  # no virus, no failures
+
+
+    def test_doc_jpeg_png(self):
+        self.step_name('Test that clamav can successfully extract jpeg and png images from doc documents')
+
+        tempdir=self.path_tmp / "TD"
+        if not os.path.isdir(tempdir):
+            os.makedirs(tempdir);
+
+        testfiles = TC.path_source / 'unit_tests' / 'input' / 'other_scanfiles' / 'has_png_and_jpeg.doc'
+        command = '{valgrind} {valgrind_args} {clamscan} -d {path_db} {testfiles} --gen-json --leave-temps --tempdir={tempdir} --debug'.format(
+            valgrind=TC.valgrind, valgrind_args=TC.valgrind_args, clamscan=TC.clamscan,
+            path_db=TC.path_build / 'unit_tests' / 'input' / 'clamav.hdb',
+            testfiles=testfiles,
+            tempdir=tempdir,
+        )
+        output = self.execute_command(command)
+
+        assert output.ec == 0  # no virus, no failures
+
+        expected_hashes = [
+                "f083e9c704165003f8c065964e4ccb47da48bbad8a80521d571cbf0f1d4762c6",
+                "40b5ae0df66540ba3ac60edf2840b4b8edd0500706105f3b63083e3a8993119a"
+                ]
+
+        hashes = []
+        for parent, dirs, files in os.walk(tempdir):
+            for f in files:
+                if f.startswith("ole2_images."):
+                    fName = os.path.join(parent, f)
+                    handle = open(fName, "rb")
+                    data = handle.read()
+                    handle.close()
+
+                    m = hashlib.sha256()
+                    m.update(data)
+                    hashes.append(m.hexdigest())
+
+        for h in hashes:
+            if not h in expected_hashes:
+                assert 1 == 0
+
+#        assert 0 == 0
+
diff --git a/unit_tests/input/other_scanfiles/has_png_and_jpeg.doc b/unit_tests/input/other_scanfiles/has_png_and_jpeg.doc
new file mode 100644
index 0000000000..f6638893a2
Binary files /dev/null and b/unit_tests/input/other_scanfiles/has_png_and_jpeg.doc differ