Merge pull request #8997 from mpg/fix-wrong-dep-test-case

Fix wrong dependencies in test cases