Separate Controller and HTTP API Test

Job #246628 failed for c9fa2eb2:

Concurrent execution of tests causes race condition