Merge pull request #6667 from s0undt3ch/develop

Testsuite fixes for Jenkins
Revert "Allow pip based installations if necessary."

This reverts commit ffaad3dc843d47ae79a9a5aa3a0b2daa2cabfb39.