diff --git a/Makefile b/Makefile
index f2ca42f9eae6e557eebffa8fb101b0983f61a933..53a1b5d8fa6a4667f64c5d0feaf9b583c869ea1e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,12 @@
 include config.mk
 
-default:
+all:
 	@${MAKE} -C src
 
+test: all
+	mandoc -Tlint man/*
+	perl test/test.pl ${PACKAGE} ${VERSION}
+
 install: install-man install-doc install-bin install-font install-img
 
 install-man:
@@ -59,5 +63,5 @@ uninstall:
 clean:
 	@${MAKE} -C src clean
 
-.PHONY: default install uninstall clean install-man install-doc install-bin \
+.PHONY: all test install uninstall clean install-man install-doc install-bin \
 	install-font install-img
diff --git a/test/customlist b/test/customlist
new file mode 100644
index 0000000000000000000000000000000000000000..3595be4d78194d5adce2c8a3c8955f60f305e1da
--- /dev/null
+++ b/test/customlist
@@ -0,0 +1,4 @@
+test/ok.gif; 16; 4; list; ok.gif; 256; 953; gif; 0; 16
+test/ok.jpg; 16; 4; list; ok.jpg; 256; 354; jpeg; 0; 16
+test/ok.png; 16; 4; list; ok.png; 256; 403; png; 0; 16
+test/ok.pnm; 16; 4; list; ok.pnm; 256; 269; pnm; 0; 16
diff --git a/test/fail.gif b/test/fail.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/fail.jpg b/test/fail.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/fail.png b/test/fail.png
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/fail.pnm b/test/fail.pnm
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/list b/test/list
new file mode 100644
index 0000000000000000000000000000000000000000..036b0f46fe539b15564f6e060a3cad5b953b44b9
--- /dev/null
+++ b/test/list
@@ -0,0 +1,5 @@
+NUM	FORMAT	WIDTH	HEIGHT	PIXELS	SIZE(bytes)	ALPHA	FILENAME
+1	gif	16	16	256	953		-	test/ok.gif
+2	jpeg	16	16	256	354		-	test/ok.jpg
+3	png	16	16	256	403		X	test/ok.png
+4	pnm	16	16	256	269		-	test/ok.pnm
diff --git a/test/ok.gif b/test/ok.gif
new file mode 100644
index 0000000000000000000000000000000000000000..613264e17d845a10e72b531db4abe8604f1bdd2c
Binary files /dev/null and b/test/ok.gif differ
diff --git a/test/ok.jpg b/test/ok.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..060565edc4bb9b92db7973a6ec93e6532bc7c981
Binary files /dev/null and b/test/ok.jpg differ
diff --git a/test/ok.png b/test/ok.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f06506f2222001f8d9526d8b659f1c0200ac5a2
Binary files /dev/null and b/test/ok.png differ
diff --git a/test/ok.pnm b/test/ok.pnm
new file mode 100644
index 0000000000000000000000000000000000000000..d62d0623688ab392cf953c294f3da4a25f753095
Binary files /dev/null and b/test/ok.pnm differ
diff --git a/test/test.pl b/test/test.pl
new file mode 100644
index 0000000000000000000000000000000000000000..69ba824ac390a3b7a4d839867edec0c86fd09fa8
--- /dev/null
+++ b/test/test.pl
@@ -0,0 +1,52 @@
+#!/usr/bin/env perl
+use strict;
+use warnings;
+use 5.010;
+use Test::Command tests => 18;
+
+my $feh = 'src/feh';
+my $images = 'test/ok.* test/fail.*';
+
+my ($feh_name, $feh_version) = @ARGV;
+
+my $re_warning =
+	qr{${feh_name} WARNING: test/fail\.... \- No Imlib2 loader for that file format\n};
+my $re_loadable = qr{test/ok\....};
+my $re_unloadable = qr{test/fail\....};
+
+my $cmd = Test::Command->new(cmd => $feh);
+
+# Insufficient Arguments -> Usage should return failure
+$cmd->exit_is_num(1, 'missing arguments return 1');
+$cmd->stdout_is_eq('', 'missing arguments print usage (!stdout)');
+$cmd->stderr_is_eq(<<"EOF", 'missing arguments print usage (stderr)');
+${feh_name} - No loadable images specified.
+Use ${feh_name} --help for detailed usage information
+EOF
+
+# feh --version / feh -v
+$cmd = Test::Command->new(cmd => "$feh --version");
+$cmd->exit_is_num(0);
+$cmd->stdout_is_eq("${feh_name} version ${feh_version}\n");
+$cmd->stderr_is_eq('');
+
+$cmd = Test::Command->new(cmd => "$feh --loadable $images");
+$cmd->exit_is_num(0);
+$cmd->stdout_like($re_loadable);
+$cmd->stderr_is_eq('');
+
+$cmd = Test::Command->new(cmd => "$feh --unloadable $images");
+$cmd->exit_is_num(0);
+$cmd->stdout_like($re_unloadable);
+$cmd->stderr_is_eq('');
+
+$cmd = Test::Command->new(cmd => "$feh --list $images");
+$cmd->exit_is_num(0);
+$cmd->stdout_is_file('test/list');
+$cmd->stderr_like($re_warning);
+
+$cmd = Test::Command->new(cmd => "$feh --customlist '%f; %h; %l; %m; %n; %p; "
+                               . "%s; %t; %u; %w' $images");
+$cmd->exit_is_num(0);
+$cmd->stdout_is_file('test/customlist');
+$cmd->stderr_like($re_warning);
diff --git a/test/warning-no-loader b/test/warning-no-loader
new file mode 100644
index 0000000000000000000000000000000000000000..0ab95a5ca1ee1c34f15e5826fd79a9dc509b081d
--- /dev/null
+++ b/test/warning-no-loader
@@ -0,0 +1,4 @@
+feh WARNING: test/fail.pnm - No Imlib2 loader for that file format
+feh WARNING: test/fail.png - No Imlib2 loader for that file format
+feh WARNING: test/fail.jpg - No Imlib2 loader for that file format
+feh WARNING: test/fail.gif - No Imlib2 loader for that file format