diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 8c2fd90ea48..c718747ddda 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-11-03  Yao Qi  <yao.qi@linaro.org>
+
+	* gdb.python/py-thrhandle.exp: Skip it if python is not
+	enabled.
+
 2017-10-31  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* gdb.mi/mi-break.exp (test_breakpoint_commands): Test backtrace
diff --git a/gdb/testsuite/gdb.python/py-thrhandle.exp b/gdb/testsuite/gdb.python/py-thrhandle.exp
index 66b04728e03..fb01ca16b82 100644
--- a/gdb/testsuite/gdb.python/py-thrhandle.exp
+++ b/gdb/testsuite/gdb.python/py-thrhandle.exp
@@ -27,6 +27,10 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab
 }
 
 clean_restart ${binfile}
+
+# Skip all tests if Python scripting is not enabled.
+if { [skip_python_tests] } { continue }
+
 runto_main
 
 gdb_test "break after_mc_barrier" \