diff --git a/llvm/test/tools/llvm-dwp/Inputs/empty_compressed_section.dwo b/llvm/test/tools/llvm-dwp/Inputs/empty_compressed_section.dwo
new file mode 100644
index 0000000..bc9b4ff
--- /dev/null
+++ b/llvm/test/tools/llvm-dwp/Inputs/empty_compressed_section.dwo
Binary files differ
diff --git a/llvm/test/tools/llvm-dwp/Inputs/invalid_compressed.dwo b/llvm/test/tools/llvm-dwp/Inputs/invalid_compressed.dwo
new file mode 100644
index 0000000..0cbfd14
--- /dev/null
+++ b/llvm/test/tools/llvm-dwp/Inputs/invalid_compressed.dwo
Binary files differ
diff --git a/llvm/test/tools/llvm-dwp/X86/compressfail.test b/llvm/test/tools/llvm-dwp/X86/compressfail.test
index d9f50cb..78b6255 100644
--- a/llvm/test/tools/llvm-dwp/X86/compressfail.test
+++ b/llvm/test/tools/llvm-dwp/X86/compressfail.test
@@ -1,5 +1,7 @@
 RUN: not llvm-dwp %p/../Inputs/compressfail/a.dwo -o %t 2>&1 | FileCheck %s
+RUN: not llvm-dwp %p/../Inputs/empty_compressed_section.dwo -o %t 2>&1 | FileCheck %s
+RUN: not llvm-dwp %p/../Inputs/invalid_compressed.dwo -o %t 2>&1 | FileCheck %s
 
 REQUIRES: zlib
 
-CHECK: error: failure while decompressing compressed section: 'zdebug_info.dwo'
+CHECK: error: failure while decompressing compressed section: 'zdebug_{{.*}}.dwo'