diff --git a/tools/test.py b/tools/test.py
index 633c347e74f0d7..56b1c8d650bc4f 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -47,7 +47,10 @@
 
 from os.path import join, dirname, abspath, basename, isdir, exists
 from datetime import datetime
-from Queue import Queue, Empty
+try:
+    from queue import Queue, Empty  # Python 3
+except ImportError:
+    from Queue import Queue, Empty  # Python 2
 
 try:
     cmp             # Python 2