Test on Travis Bug 938657 and Bug 960240

Please DO NOT MERGE this