diff --git a/Makefile b/Makefile
index f348d57e119f14d35f9fef191adf8924a2248186..8b8a00e8ccf00344869d752ede582f0bc692b2e9 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,6 @@ all:
 	@${MAKE} -C src
 
 test: all
-	@mandoc -Tlint man/*
 	@PACKAGE=${PACKAGE} VERSION=${VERSION} prove test
 
 install: install-man install-doc install-bin install-font install-img
diff --git a/test/mandoc.t b/test/mandoc.t
new file mode 100755
index 0000000000000000000000000000000000000000..b0882abb6d82fc013ab46fed72ac13079f5795d8
--- /dev/null
+++ b/test/mandoc.t
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+use strict;
+use warnings;
+use 5.010;
+
+use Test::More tests => 3;
+
+SKIP: {
+	qx{mandoc -V};
+
+	if ($? != 0) {
+		skip('mandoc not installed', 3);
+	}
+
+	for my $file ('feh', 'feh-cam', 'gen-cam-menu') {
+		qx{mandoc -Tlint man/${file}.1};
+		is($?, 0, "${file}.1: Valid mdoc syntax");
+	}
+}