diff --git a/test-data/im1_float.tif b/test-data/im1_float.tif
new file mode 100644
index 00000000000..65395c1b6a2
Binary files /dev/null and b/test-data/im1_float.tif differ
diff --git a/test-data/im1_uint8.png b/test-data/im1_uint8.png
new file mode 100644
index 00000000000..c629ee39761
Binary files /dev/null and b/test-data/im1_uint8.png differ
diff --git a/test-data/im1_uint8.tif b/test-data/im1_uint8.tif
new file mode 100644
index 00000000000..35b5052b90e
Binary files /dev/null and b/test-data/im1_uint8.tif differ
diff --git a/test-data/im2_a.png b/test-data/im2_a.png
new file mode 100644
index 00000000000..166cdb5b319
Binary files /dev/null and b/test-data/im2_a.png differ
diff --git a/test-data/im2_b.png b/test-data/im2_b.png
new file mode 100644
index 00000000000..be2e85f25f8
Binary files /dev/null and b/test-data/im2_b.png differ
diff --git a/test/functional/tools/image_diff.xml b/test/functional/tools/image_diff.xml
new file mode 100644
index 00000000000..c65c7eca8f5
--- /dev/null
+++ b/test/functional/tools/image_diff.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/functional/tools/sample_tool_conf.xml b/test/functional/tools/sample_tool_conf.xml
index 8df30a78eff..77539c2433d 100644
--- a/test/functional/tools/sample_tool_conf.xml
+++ b/test/functional/tools/sample_tool_conf.xml
@@ -8,6 +8,7 @@
+