r8978: fix cleanup after a test