diff --git a/python/run-tests b/python/run-tests
index b2b60f08b48e2..374a20b093deb 100755
--- a/python/run-tests
+++ b/python/run-tests
@@ -56,6 +56,9 @@ run_test "pyspark/mllib/clustering.py"
 run_test "pyspark/mllib/recommendation.py"
 run_test "pyspark/mllib/regression.py"
 
+# Remove the metastore directory created by the HiveContext tests in SparkSQL
+rm -r metastore
+
 if [[ $FAILED == 0 ]]; then
     echo -en "\033[32m"  # Green
     echo "Tests passed."