diff --git a/.gitignore b/.gitignore
index 18f2204efd..a99fd14310 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ doc/cql3/CQL.html
 doc/build/
 lib/
 pylib/src/
+**/cqlshlib.xml
 !lib/cassandra-driver-internal-only-*.zip
 
 # C* debs
@@ -65,6 +66,7 @@ target/
 *.tmp
 .DS_Store
 Thumbs.db
+.ccm/
 
 **/.ant-targets-build.xml
 .ant_targets
diff --git a/pylib/cassandra-cqlsh-tests.sh b/pylib/cassandra-cqlsh-tests.sh
index 591094fb68..d0448fabd0 100755
--- a/pylib/cassandra-cqlsh-tests.sh
+++ b/pylib/cassandra-cqlsh-tests.sh
@@ -118,9 +118,12 @@ ccm start --wait-for-binary-proto
 cd ${CASSANDRA_DIR}/pylib/cqlshlib/
 
 set +e # disable immediate exit from this point
-pytest
+pytest --junitxml=${WORKSPACE}/cqlshlib.xml
 RETURN="$?"
 
+sed -i "s/testsuite errors=\(\".*\"\) failures=\(\".*\"\) hostname=\(\".*\"\) name=\"pytest\"/testsuite errors=\1 failures=\2 hostname=\3 name=\"${TESTSUITE_NAME}\"/g" ${WORKSPACE}/cqlshlib.xml
+sed -i "s/testcase classname=\"cqlshlib./testcase classname=\"${TESTSUITE_NAME}./g" ${WORKSPACE}/cqlshlib.xml
+
 ccm remove
 
 ################################