Merge "Properly skip nova tests if nova isn't available"