diff --git a/test/feh-scr.i b/test/feh-scr.i
index dd7ece731ac86eed16473d46602983638692947a..3f3b2412658aba0688f133bfbb4abd0aa243c20d 100755
--- a/test/feh-scr.i
+++ b/test/feh-scr.i
@@ -6,7 +6,7 @@ use autodie qw/:all/;
 
 use Cwd;
 use GD qw/:DEFAULT :cmp/;
-use Test::More tests => 19;
+use Test::More tests => 27;
 use Time::HiRes qw/sleep/;
 use X11::GUITest qw/:ALL/;
 
@@ -175,6 +175,47 @@ test_scr('caption_none');
 
 feh_stop();
 
+feh_start(
+	'--draw-actions --action8 "nrm \'%f\'"',
+	'test/bg/exact/in'
+);
+test_scr('draw_action');
+feh_stop();
+
+feh_start(
+	'--draw-filename',
+	'test/bg/exact/in'
+);
+test_scr('draw_filename');
+feh_stop();
+
+feh_start(
+	'--draw-filename --draw-actions --action8 "nrm \'%f\'"',
+	'test/bg/exact/in'
+);
+test_scr('draw_filename_action');
+feh_stop();
+
+feh_start(
+	'--action8 "nrm \'%f\'"',
+	'test/bg/exact/in'
+);
+test_scr('draw_nothing');
+
+SendKeys('d');
+test_scr('draw_filename');
+
+SendKeys('da');
+test_scr('draw_action');
+
+SendKeys('d');
+test_scr('draw_filename_action');
+
+SendKeys('ddaada');
+test_scr('draw_nothing');
+
+feh_stop();
+
 unlink('test/bg/exact/.tc/in.txt');
 rmdir('test/bg/exact/.tc');
 unlink("/tmp/feh_${$}.png");
diff --git a/test/scr/draw_action b/test/scr/draw_action
new file mode 100644
index 0000000000000000000000000000000000000000..4a2b06c4d736ac94a9243fc301a352ac368982de
Binary files /dev/null and b/test/scr/draw_action differ
diff --git a/test/scr/draw_filename b/test/scr/draw_filename
new file mode 100644
index 0000000000000000000000000000000000000000..dc323562a91fcd1941ccb053b9ea57c85e620449
Binary files /dev/null and b/test/scr/draw_filename differ
diff --git a/test/scr/draw_filename_action b/test/scr/draw_filename_action
new file mode 100644
index 0000000000000000000000000000000000000000..6039defbe3e7a3db38f57fe958fd5e176f944148
Binary files /dev/null and b/test/scr/draw_filename_action differ
diff --git a/test/scr/draw_nothing b/test/scr/draw_nothing
new file mode 100644
index 0000000000000000000000000000000000000000..5903c3429587f2abc4ff856acbdbf9d0ce2f4337
Binary files /dev/null and b/test/scr/draw_nothing differ