diff --git a/Makefile.am b/Makefile.am
index bf853c8f90c..d4e3e9a0138 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3872,7 +3872,8 @@ TESTS += \
 
 if HAVE_PYTHON
 TESTS += \
-	test/rule-syntax-check.py
+	test/rule-syntax-check.py \
+	hwdb/parse_hwdb.py
 
 if HAVE_SYSV_COMPAT
 TESTS += \
@@ -3924,7 +3925,8 @@ EXTRA_DIST += \
 	test/udev-test.pl \
 	test/rule-syntax-check.py \
 	test/sysv-generator-test.py \
-	test/mocks/fsck
+	test/mocks/fsck \
+	hwdb/parse_hwdb.py
 
 # ------------------------------------------------------------------------------
 ata_id_SOURCES = \
diff --git a/hwdb/parse_hwdb.py b/hwdb/parse_hwdb.py
old mode 100644
new mode 100755
index 773513eaf0a..99d034b4e05
--- a/hwdb/parse_hwdb.py
+++ b/hwdb/parse_hwdb.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python3
 #  -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
 #
 #  This file is part of systemd.
@@ -17,9 +18,11 @@
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
-import sys
-import string
 import functools
+import glob
+import string
+import sys
+import os
 
 try:
     from pyparsing import (Word, White, Literal, ParserElement, Regex,
@@ -29,7 +32,8 @@ try:
                            stringEnd, pythonStyleComment,
                            ParseBaseException)
 except ImportError:
-    sys.exit('pyparsing is not available')
+    print('pyparsing is not available')
+    sys.exit(77)
 
 try:
     from evdev.ecodes import ecodes
@@ -168,7 +172,9 @@ def print_summary(fname, groups):
           ))
 
 if __name__ == '__main__':
-    for fname in sys.argv[1:]:
+    args = sys.argv[1:] or glob.glob(os.path.dirname(sys.argv[0]) + '/[67]0-*.hwdb')
+
+    for fname in args:
         groups = parse(fname)
         print_summary(fname, groups)
         check_match_uniqueness(groups)