diff --git a/modules/xphoto/test/simple_color_balance.cpp b/modules/xphoto/test/simple_color_balance.cpp
index 956e2b11d..bf30271ba 100644
--- a/modules/xphoto/test/simple_color_balance.cpp
+++ b/modules/xphoto/test/simple_color_balance.cpp
@@ -4,8 +4,7 @@ namespace cvtest
 {
     TEST(xphoto_simplecolorbalance, regression)
     {
-        cv::String subfolder = "cv/xphoto/";
-        cv::String dir = cvtest::TS::ptr()->get_data_path() + subfolder + "simple_white_balance/";
+        cv::String dir = cvtest::TS::ptr()->get_data_path() + "cv/xphoto/simple_white_balance/";
         int nTests = 12;
         float threshold = 0.005f;
 
@@ -28,4 +27,4 @@ namespace cvtest
             EXPECT_LE( mse[0]+mse[1]+mse[2]+mse[3], threshold );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/xphoto/test/test_grayworld.cpp b/modules/xphoto/test/test_grayworld.cpp
index 737b101e4..81ae287a1 100644
--- a/modules/xphoto/test/test_grayworld.cpp
+++ b/modules/xphoto/test/test_grayworld.cpp
@@ -65,8 +65,7 @@ namespace cvtest {
 
     TEST(xphoto_grayworld_white_balance, regression)
     {
-        String subfolder = "/xphoto/";
-        String dir = cvtest::TS::ptr()->get_data_path() + subfolder + "simple_white_balance/";
+        String dir = cvtest::TS::ptr()->get_data_path() + "cv/xphoto/simple_white_balance/";
         const int nTests = 14;
         const float wb_thresh = 0.5f;
         const float acc_thresh = 2.f;
diff --git a/modules/xphoto/testdata/xphoto/dct_image_denoising/results/01.png b/modules/xphoto/testdata/xphoto/dct_image_denoising/results/01.png
deleted file mode 100644
index d451f21fa..000000000
Binary files a/modules/xphoto/testdata/xphoto/dct_image_denoising/results/01.png and /dev/null differ
diff --git a/modules/xphoto/testdata/xphoto/dct_image_denoising/sources/01.png b/modules/xphoto/testdata/xphoto/dct_image_denoising/sources/01.png
deleted file mode 100644
index a7ac74db8..000000000
Binary files a/modules/xphoto/testdata/xphoto/dct_image_denoising/sources/01.png and /dev/null differ
diff --git a/modules/xphoto/testdata/xphoto/inpainting/mask_1.png b/modules/xphoto/testdata/xphoto/inpainting/mask_1.png
deleted file mode 100644
index f100fed07..000000000
Binary files a/modules/xphoto/testdata/xphoto/inpainting/mask_1.png and /dev/null differ
diff --git a/modules/xphoto/testdata/xphoto/inpainting/src_1.jpg b/modules/xphoto/testdata/xphoto/inpainting/src_1.jpg
deleted file mode 100644
index 64cd3cef9..000000000
Binary files a/modules/xphoto/testdata/xphoto/inpainting/src_1.jpg and /dev/null differ
diff --git a/modules/xphoto/testdata/xphoto/simple_white_balance/results/01.png b/modules/xphoto/testdata/xphoto/simple_white_balance/results/01.png
deleted file mode 100644
index 0e35a9875..000000000
Binary files a/modules/xphoto/testdata/xphoto/simple_white_balance/results/01.png and /dev/null differ
diff --git a/modules/xphoto/testdata/xphoto/simple_white_balance/results/02.png b/modules/xphoto/testdata/xphoto/simple_white_balance/results/02.png
deleted file mode 100644
index 9bcbf295b..000000000
Binary files a/modules/xphoto/testdata/xphoto/simple_white_balance/results/02.png and /dev/null differ
diff --git a/modules/xphoto/testdata/xphoto/simple_white_balance/results/03.png b/modules/xphoto/testdata/xphoto/simple_white_balance/results/03.png
deleted file mode 100644
index c92e59b68..000000000
Binary files a/modules/xphoto/testdata/xphoto/simple_white_balance/results/03.png and /dev/null differ
diff --git a/modules/xphoto/testdata/xphoto/simple_white_balance/results/04.png b/modules/xphoto/testdata/xphoto/simple_white_balance/results/04.png
deleted file mode 100644
index 3df7fa933..000000000
Binary files a/modules/xphoto/testdata/xphoto/simple_white_balance/results/04.png and /dev/null differ
diff --git a/modules/xphoto/testdata/xphoto/simple_white_balance/results/05.png b/modules/xphoto/testdata/xphoto/simple_white_balance/results/05.png
deleted file mode 100644
index 50c51aac5..000000000
Binary files a/modules/xphoto/testdata/xphoto/simple_white_balance/results/05.png and /dev/null differ
diff --git a/modules/xphoto/testdata/xphoto/simple_white_balance/results/06.png b/modules/xphoto/testdata/xphoto/simple_white_balance/results/06.png
deleted file mode 100644
index 130e980a4..000000000
Binary files a/modules/xphoto/testdata/xphoto/simple_white_balance/results/06.png and /dev/null differ
diff --git a/modules/xphoto/testdata/xphoto/simple_white_balance/results/07.png b/modules/xphoto/testdata/xphoto/simple_white_balance/results/07.png
deleted file mode 100644
index 256811d36..000000000
Binary files a/modules/xphoto/testdata/xphoto/simple_white_balance/results/07.png and /dev/null differ
diff --git a/modules/xphoto/testdata/xphoto/simple_white_balance/results/08.png b/modules/xphoto/testdata/xphoto/simple_white_balance/results/08.png
deleted file mode 100644
index afa68b0f5..000000000
Binary files a/modules/xphoto/testdata/xphoto/simple_white_balance/results/08.png and /dev/null differ
diff --git a/modules/xphoto/testdata/xphoto/simple_white_balance/results/09.png b/modules/xphoto/testdata/xphoto/simple_white_balance/results/09.png
deleted file mode 100644
index afa68b0f5..000000000
Binary files a/modules/xphoto/testdata/xphoto/simple_white_balance/results/09.png and /dev/null differ
diff --git a/modules/xphoto/testdata/xphoto/simple_white_balance/results/10.png b/modules/xphoto/testdata/xphoto/simple_white_balance/results/10.png
deleted file mode 100644
index 7c7378694..000000000
Binary files a/modules/xphoto/testdata/xphoto/simple_white_balance/results/10.png and /dev/null differ
diff --git a/modules/xphoto/testdata/xphoto/simple_white_balance/results/11.png b/modules/xphoto/testdata/xphoto/simple_white_balance/results/11.png
deleted file mode 100644
index 99919996f..000000000
Binary files a/modules/xphoto/testdata/xphoto/simple_white_balance/results/11.png and /dev/null differ
diff --git a/modules/xphoto/testdata/xphoto/simple_white_balance/results/12.png b/modules/xphoto/testdata/xphoto/simple_white_balance/results/12.png
deleted file mode 100644
index 4f80234da..000000000
Binary files a/modules/xphoto/testdata/xphoto/simple_white_balance/results/12.png and /dev/null differ
diff --git a/modules/xphoto/testdata/xphoto/simple_white_balance/results/13.png b/modules/xphoto/testdata/xphoto/simple_white_balance/results/13.png
deleted file mode 100644
index 6d21a0dd3..000000000
Binary files a/modules/xphoto/testdata/xphoto/simple_white_balance/results/13.png and /dev/null differ
diff --git a/modules/xphoto/testdata/xphoto/simple_white_balance/results/14.png b/modules/xphoto/testdata/xphoto/simple_white_balance/results/14.png
deleted file mode 100644
index 4d31aa351..000000000
Binary files a/modules/xphoto/testdata/xphoto/simple_white_balance/results/14.png and /dev/null differ
diff --git a/modules/xphoto/testdata/xphoto/simple_white_balance/sources/01.png b/modules/xphoto/testdata/xphoto/simple_white_balance/sources/01.png
deleted file mode 100644
index d44be3af3..000000000
Binary files a/modules/xphoto/testdata/xphoto/simple_white_balance/sources/01.png and /dev/null differ
diff --git a/modules/xphoto/testdata/xphoto/simple_white_balance/sources/02.png b/modules/xphoto/testdata/xphoto/simple_white_balance/sources/02.png
deleted file mode 100644
index 723e2124a..000000000
Binary files a/modules/xphoto/testdata/xphoto/simple_white_balance/sources/02.png and /dev/null differ
diff --git a/modules/xphoto/testdata/xphoto/simple_white_balance/sources/03.png b/modules/xphoto/testdata/xphoto/simple_white_balance/sources/03.png
deleted file mode 100644
index eeecf07c0..000000000
Binary files a/modules/xphoto/testdata/xphoto/simple_white_balance/sources/03.png and /dev/null differ
diff --git a/modules/xphoto/testdata/xphoto/simple_white_balance/sources/04.png b/modules/xphoto/testdata/xphoto/simple_white_balance/sources/04.png
deleted file mode 100644
index 096a79d6d..000000000
Binary files a/modules/xphoto/testdata/xphoto/simple_white_balance/sources/04.png and /dev/null differ
diff --git a/modules/xphoto/testdata/xphoto/simple_white_balance/sources/05.png b/modules/xphoto/testdata/xphoto/simple_white_balance/sources/05.png
deleted file mode 100644
index a23c632c1..000000000
Binary files a/modules/xphoto/testdata/xphoto/simple_white_balance/sources/05.png and /dev/null differ
diff --git a/modules/xphoto/testdata/xphoto/simple_white_balance/sources/06.png b/modules/xphoto/testdata/xphoto/simple_white_balance/sources/06.png
deleted file mode 100644
index 3bf87ef31..000000000
Binary files a/modules/xphoto/testdata/xphoto/simple_white_balance/sources/06.png and /dev/null differ
diff --git a/modules/xphoto/testdata/xphoto/simple_white_balance/sources/07.png b/modules/xphoto/testdata/xphoto/simple_white_balance/sources/07.png
deleted file mode 100644
index 448a86660..000000000
Binary files a/modules/xphoto/testdata/xphoto/simple_white_balance/sources/07.png and /dev/null differ
diff --git a/modules/xphoto/testdata/xphoto/simple_white_balance/sources/08.png b/modules/xphoto/testdata/xphoto/simple_white_balance/sources/08.png
deleted file mode 100644
index 5b4cd8008..000000000
Binary files a/modules/xphoto/testdata/xphoto/simple_white_balance/sources/08.png and /dev/null differ
diff --git a/modules/xphoto/testdata/xphoto/simple_white_balance/sources/09.png b/modules/xphoto/testdata/xphoto/simple_white_balance/sources/09.png
deleted file mode 100644
index 5b4cd8008..000000000
Binary files a/modules/xphoto/testdata/xphoto/simple_white_balance/sources/09.png and /dev/null differ
diff --git a/modules/xphoto/testdata/xphoto/simple_white_balance/sources/10.png b/modules/xphoto/testdata/xphoto/simple_white_balance/sources/10.png
deleted file mode 100644
index e9e10baba..000000000
Binary files a/modules/xphoto/testdata/xphoto/simple_white_balance/sources/10.png and /dev/null differ
diff --git a/modules/xphoto/testdata/xphoto/simple_white_balance/sources/11.png b/modules/xphoto/testdata/xphoto/simple_white_balance/sources/11.png
deleted file mode 100644
index 481059c55..000000000
Binary files a/modules/xphoto/testdata/xphoto/simple_white_balance/sources/11.png and /dev/null differ
diff --git a/modules/xphoto/testdata/xphoto/simple_white_balance/sources/12.png b/modules/xphoto/testdata/xphoto/simple_white_balance/sources/12.png
deleted file mode 100644
index 595cdef14..000000000
Binary files a/modules/xphoto/testdata/xphoto/simple_white_balance/sources/12.png and /dev/null differ
diff --git a/modules/xphoto/testdata/xphoto/simple_white_balance/sources/13.png b/modules/xphoto/testdata/xphoto/simple_white_balance/sources/13.png
deleted file mode 100644
index 226c7a796..000000000
Binary files a/modules/xphoto/testdata/xphoto/simple_white_balance/sources/13.png and /dev/null differ
diff --git a/modules/xphoto/testdata/xphoto/simple_white_balance/sources/14.png b/modules/xphoto/testdata/xphoto/simple_white_balance/sources/14.png
deleted file mode 100644
index 6374d4232..000000000
Binary files a/modules/xphoto/testdata/xphoto/simple_white_balance/sources/14.png and /dev/null differ