Merge pull request #166 from TobiasBg/master

Apply changes from http://core.trac.wordpress.org/changeset/25571 to vvv's copy of wp-tests-config.php