diff --git a/README-SAMPLES.md b/README-SAMPLES.md
index d755537d..eea883f3 100644
--- a/README-SAMPLES.md
+++ b/README-SAMPLES.md
@@ -256,7 +256,7 @@ Demonstrates Exiv2 library APIs to print Iptc data. _Code: [iptcprint.cpp](sampl
 #### metacopy
 
 ```
-Usage: metacopy [-iecaph] readfile writefile
+Usage: metacopy [-iecxaph] readfile writefile
 Reads and writes raw metadata. Use -h option for help.
 ```
 
diff --git a/tests/bugfixes/github/test_issue_1504.py b/tests/bugfixes/github/test_issue_1504.py
new file mode 100644
index 00000000..c58edf42
--- /dev/null
+++ b/tests/bugfixes/github/test_issue_1504.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+
+import system_tests
+class issue_1504_metacopy(metaclass=system_tests.CaseMeta):
+    url = "https://github.com/Exiv2/exiv2/pull/1504"
+    commands = ["$metacopy"
+               ,"$metacopy -h"
+               ]
+    retval = [ 1,2] 
+    stderr = [ """metacopy: Read and write files must be specified
+""",""]
+    stdout = ["""
+Reads and writes raw metadata. Use -h option for help.
+Usage: metacopy [-iecxaph] readfile writefile
+""","""
+Reads and writes raw metadata. Use -h option for help.
+Usage: metacopy [-iecxaph] readfile writefile
+
+Options:
+   -i      Read Iptc data from readfile and write to writefile.
+   -e      Read Exif data from readfile and write to writefile.
+   -c      Read Jpeg comment from readfile and write to writefile.
+   -x      Read XMP data from readfile and write to writefile.
+   -a      Read all metadata from readfile and write to writefile.
+   -p      Preserve existing metadata in writefile if not replaced.
+   -h      Display this help and exit.
+
+"""]
diff --git a/tests/suite.conf b/tests/suite.conf
index 2ca37435..ac3c7a0c 100644
--- a/tests/suite.conf
+++ b/tests/suite.conf
@@ -26,6 +26,7 @@ valgrind:
 exiv2: ${ENV:exiv2_path}/exiv2
 unit_tests: ${ENV:exiv2_path}/unit_tests
 exiv2json: ${ENV:exiv2_path}/exiv2json
+metacopy: ${ENV:exiv2_path}/metacopy
 data_path: ../test/data
 tmp_path: ../test/tmp
 tiff_test: ${ENV:exiv2_path}/tiff-test