Change package to test cases
Fix JENKINS-18095 and JENKINS-18575