Index: mysql-test/Makefile.am
===================================================================
--- mysql-test/Makefile.am.orig
+++ mysql-test/Makefile.am
@@ -17,7 +17,7 @@
 
 ## Process this file with automake to create Makefile.in
 
-testroot =	$(prefix)
+testroot =	$(datadir)
 testdir =	$(testroot)/mysql-test
 
 test_SCRIPTS =	mtr \
Index: mysql-test/lib/My/SafeProcess/Makefile.am
===================================================================
--- mysql-test/lib/My/SafeProcess/Makefile.am.orig
+++ mysql-test/lib/My/SafeProcess/Makefile.am
@@ -13,7 +13,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-testroot = $(prefix)
+testroot = $(datadir)
 safedir = $(testroot)/mysql-test/lib/My/SafeProcess
 #nobase_bin_PROGRAMS = ...
 safe_PROGRAMS =		my_safe_process
Index: mysql-test/lib/mtr_cases.pm
===================================================================
--- mysql-test/lib/mtr_cases.pm.orig
+++ mysql-test/lib/mtr_cases.pm
@@ -262,7 +262,10 @@ sub collect_one_suite($)
 			     ["mysql-test/suite",
 			      "mysql-test",
 			      # Look in storage engine specific suite dirs
-			      "storage/*/mysql-test-suites"
+			      "storage/*/mysql-test-suites",
+			      # Look in subdirectories too
+			      "*/mysql-test/suite",
+			      "*/mysql-test"
 			     ],
 			     [$suite]);
     }