diff --git a/extra/libevent/event-internal.h b/extra/libevent/event-internal.h
index 19b7a547a84..9dd0c4d7632 100644
--- a/extra/libevent/event-internal.h
+++ b/extra/libevent/event-internal.h
@@ -70,6 +70,11 @@ struct event_base {
 
 /* Internal use only: Functions that might be missing from <sys/queue.h> */
 #ifndef HAVE_TAILQFOREACH
+/* These following macros are copied from BSD sys/queue.h
+   Copyright (c) 1991, 1993, The Regents of the University of California.
+   All rights reserved.
+*/
+#define	TAILQ_EMPTY(head)		((head)->tqh_first == NULL)
 #define	TAILQ_FIRST(head)		((head)->tqh_first)
 #define	TAILQ_END(head)			NULL
 #define	TAILQ_NEXT(elm, field)		((elm)->field.tqe_next)
diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
index f37353b195c..76575b2f498 100644
--- a/mysql-test/lib/mtr_cases.pm
+++ b/mysql-test/lib/mtr_cases.pm
@@ -249,6 +249,10 @@ sub collect_one_suite($)
       $suitedir= my_find_dir($::basedir,
 			     ["mysql-test/suite",
 			      "mysql-test",
+			      "share/mysql-test/suite",
+			      "share/mysql-test",
+			      "share/mysql/mysql-test/suite",
+			      "share/mysql/mysql-test",
 			      # Look in storage engine specific suite dirs
 			      "storage/*/mysql-test-suites"
 			     ],
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index b3cdbfc1e1a..526077a7de1 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1000,6 +1000,12 @@ sub command_line_setup {
   {
     $basedir= dirname($basedir);
   }
+  # For .deb, it's like RPM, but installed in /usr/share/mysql/mysql-test.
+  # So move up one more directory level yet.
+  if ( ! $source_dist and ! -d "$basedir/bin" )
+  {
+    $basedir= dirname($basedir);
+  }
 
   # Look for the client binaries directory
   if ($path_client_bindir)