Merge "Fix the condition of nova cert tests"