@AfterAll
    public static void finalCleanup(final TestInfo testInfo) {

        final StroomIntegrationTest stroomIntegrationTest = CURRENT_TEST_CLASS_THREAD_LOCAL.get();
        if (stroomIntegrationTest != null) {
            stroomIntegrationTest.info("AfterAll cleanup", testInfo);
            stroomIntegrationTest.cleanup();
        } else {
            LOGGER.info("CURRENT_TEST_CLASS_THREAD_LOCAL is null");
        }
    }
Ensure final cleanup even if we aren't clearing between tests.
stroom-app/src/test/java/stroom/test/StroomIntegrationTest.java