diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_blobs.cnf b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_blobs.cnf
deleted file mode 100644
index d758d29f4810a3ecceb0452ad5726cc1795973e0..0000000000000000000000000000000000000000
--- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_blobs.cnf
+++ /dev/null
@@ -1 +0,0 @@
-!include suite/rpl/t/rpl_row_img.cnf
diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_blobs.test b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_blobs.test
index a52e96dc19d0d326f41b69b75766d0c63737dc3c..ff4a0435a5e28e510184a023fefdfe49ce0532d5 100644
--- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_blobs.test
+++ b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_blobs.test
@@ -1,4 +1,5 @@
 #Want to skip this test from daily Valgrind execution
+skip Require rpl files from MySQL;
 --source include/no_valgrind_without_big.inc
 
 -- source include/have_innodb.inc
diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_full.cnf b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_full.cnf
deleted file mode 100644
index d758d29f4810a3ecceb0452ad5726cc1795973e0..0000000000000000000000000000000000000000
--- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_full.cnf
+++ /dev/null
@@ -1 +0,0 @@
-!include suite/rpl/t/rpl_row_img.cnf
diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_full.test b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_full.test
index cfbc6519182c1399ae62b965b158b702935b2503..68ff71752ac00404ebf84f41c8676e593ab87e4c 100644
--- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_full.test
+++ b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_full.test
@@ -1,4 +1,5 @@
 #Want to skip this test from daily Valgrind execution
+skip Require rpl files from MySQL;
 -- source include/no_valgrind_without_big.inc
 #
 # This file contains tests for WL#5096 and bug fixes. 
diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_min.cnf b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_min.cnf
deleted file mode 100644
index d758d29f4810a3ecceb0452ad5726cc1795973e0..0000000000000000000000000000000000000000
--- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_min.cnf
+++ /dev/null
@@ -1 +0,0 @@
-!include suite/rpl/t/rpl_row_img.cnf
diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_min.test b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_min.test
index 4c832208feb6c7aada30d45513b1b0b9e08a4d58..3ba958fc6914c325c6fd2f89a465884aa8ef7ac3 100644
--- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_min.test
+++ b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_min.test
@@ -1,4 +1,5 @@
 #Want to skip this test from daily Valgrind execution
+skip Require rpl files from MySQL;
 -- source include/no_valgrind_without_big.inc
 #
 # This file contains tests for WL#5096 and bug fixes. 
diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_noblob.cnf b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_noblob.cnf
deleted file mode 100644
index d758d29f4810a3ecceb0452ad5726cc1795973e0..0000000000000000000000000000000000000000
--- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_noblob.cnf
+++ /dev/null
@@ -1 +0,0 @@
-!include suite/rpl/t/rpl_row_img.cnf
diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_noblob.test b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_noblob.test
index 00b6448ad72ba9fe1247204453354840b2ba0aad..f539e3ac370690fc7b85de3c9c3f523bcb06d73a 100644
--- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_noblob.test
+++ b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_noblob.test
@@ -1,4 +1,5 @@
 #Want to skip this test from daily Valgrind execution
+skip Require rpl files from MySQL;
 -- source include/no_valgrind_without_big.inc
 #
 # This file contains tests for WL#5096 and bug fixes. 
diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_full.cnf b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_full.cnf
deleted file mode 100644
index d758d29f4810a3ecceb0452ad5726cc1795973e0..0000000000000000000000000000000000000000
--- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_full.cnf
+++ /dev/null
@@ -1 +0,0 @@
-!include suite/rpl/t/rpl_row_img.cnf
diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_full.test b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_full.test
index 6f683776c3c9ae28c56db154ca4232fdd4f51365..9dfd1675f53ae9191d835a27dfad0d4466ace777 100644
--- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_full.test
+++ b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_full.test
@@ -1,4 +1,5 @@
 #Want to skip this test from daily Valgrind execution
+skip Require rpl files from MySQL;
 -- source include/no_valgrind_without_big.inc
 #
 # This file contains tests for WL#5096.
diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_min.cnf b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_min.cnf
deleted file mode 100644
index d758d29f4810a3ecceb0452ad5726cc1795973e0..0000000000000000000000000000000000000000
--- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_min.cnf
+++ /dev/null
@@ -1 +0,0 @@
-!include suite/rpl/t/rpl_row_img.cnf
diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_min.test b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_min.test
index 030bc6552913ceb20f55c3d2417130e4038a546c..03e022940a6dcdcc8537e04ab75ba274d63beabe 100644
--- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_min.test
+++ b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_min.test
@@ -1,4 +1,5 @@
 #Want to skip this test from daily Valgrind execution
+skip Require rpl files from MySQL;
 --source include/no_valgrind_without_big.inc
 #
 # This file contains tests for WL#5096.
diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_noblob.cnf b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_noblob.cnf
deleted file mode 100644
index d758d29f4810a3ecceb0452ad5726cc1795973e0..0000000000000000000000000000000000000000
--- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_noblob.cnf
+++ /dev/null
@@ -1 +0,0 @@
-!include suite/rpl/t/rpl_row_img.cnf
diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_noblob.test b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_noblob.test
index 785f79bccdcdcfd7689da8ada8539cf3c425850b..ed147c8902b448f1e456a46434f34fa2b4903d57 100644
--- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_noblob.test
+++ b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_noblob.test
@@ -1,4 +1,5 @@
 #Want to skip this test from daily Valgrind execution
+skip Require rpl files from MySQL;
 -- source include/no_valgrind_without_big.inc
 #
 # This file contains tests for WL#5096.