diff --git a/src/test/kotlin/io/provs/core/processors/ContainerUbuntuHostProcessorTest.kt b/src/test/kotlin/io/provs/core/processors/ContainerUbuntuHostProcessorTest.kt
index 9b90099..eb2ff16 100644
--- a/src/test/kotlin/io/provs/core/processors/ContainerUbuntuHostProcessorTest.kt
+++ b/src/test/kotlin/io/provs/core/processors/ContainerUbuntuHostProcessorTest.kt
@@ -1,7 +1,6 @@
 package io.provs.core.processors
 
 import io.provs.core.platforms.SHELL
-import io.provs.test.DEFAULT_START_MODE_TEST_CONTAINER
 import io.provs.test.tags.ContainerTest
 import io.provs.test.testDockerWithSudo
 import org.junit.jupiter.api.Assertions.assertEquals
@@ -9,6 +8,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.condition.EnabledOnOs
 import org.junit.jupiter.api.condition.OS.LINUX
 
+val DEFAULT_START_MODE_TEST_CONTAINER = ContainerStartMode.USE_RUNNING_ELSE_CREATE
 
 class ContainerUbuntuHostProcessorTest {
 
diff --git a/src/test/kotlin/io/provs/ubuntu/extensions/workplace/base/GopassBridgeKtTest.kt b/src/test/kotlin/io/provs/ubuntu/extensions/workplace/base/GopassBridgeKtTest.kt
index e2d710f..f2b0cde 100644
--- a/src/test/kotlin/io/provs/ubuntu/extensions/workplace/base/GopassBridgeKtTest.kt
+++ b/src/test/kotlin/io/provs/ubuntu/extensions/workplace/base/GopassBridgeKtTest.kt
@@ -5,6 +5,7 @@ import io.provs.core.ProvResult
 import io.provs.core.Secret
 import io.provs.core.docker.exitAndRmContainer
 import io.provs.core.local
+import io.provs.core.processors.ContainerStartMode
 import io.provs.test.defaultTestContainer
 import io.provs.test.tags.ContainerTest
 import io.provs.test.tags.NonCi
@@ -73,8 +74,7 @@ internal class GopassBridgeKtTest {
     @NonCi
     fun test_install_GopassBridgeJsonApi_with_incompatible_gopass_jsonapi_version_installed() {
         // given
-        local().exitAndRmContainer("provs_test")
-        val a = defaultTestContainer()
+        val a = defaultTestContainer(ContainerStartMode.CREATE_NEW_KILL_EXISTING)
         val preparationResult = a.def {
             aptInstallCurl()
 
@@ -108,8 +108,7 @@ internal class GopassBridgeKtTest {
     @NonCi
     fun test_install_GopassBridgeJsonApi_with_incompatible_gopass_version_installed() {
         // given
-        local().exitAndRmContainer("provs_test")
-        val a = defaultTestContainer()
+        val a = defaultTestContainer(ContainerStartMode.CREATE_NEW_KILL_EXISTING)
         val preparationResult = a.def {
             aptInstallCurl()
             configureGpgKeys(
diff --git a/src/test/kotlin/io/provs/ubuntu/keys/base/GpgKtTest.kt b/src/test/kotlin/io/provs/ubuntu/keys/base/GpgKtTest.kt
index 07ed4ac..d1380e8 100644
--- a/src/test/kotlin/io/provs/ubuntu/keys/base/GpgKtTest.kt
+++ b/src/test/kotlin/io/provs/ubuntu/keys/base/GpgKtTest.kt
@@ -2,8 +2,10 @@ package io.provs.ubuntu.keys.base
 
 import io.provs.core.Prov
 import io.provs.core.Secret
+import io.provs.core.processors.ContainerStartMode
 import io.provs.test.defaultTestContainer
 import io.provs.test.tags.ContainerTest
+import io.provs.ubuntu.install.base.aptInstall
 import io.provs.ubuntu.keys.KeyPair
 import io.provs.ubuntu.keys.privateGPGSnakeoilKey
 import io.provs.ubuntu.keys.publicGPGSnakeoilKey
@@ -14,9 +16,15 @@ import org.junit.jupiter.api.Test
 internal class GpgKtTest {
 
     @Test
+    @ContainerTest
     fun gpgFingerprint_returnsCorrectFingerprint() {
+        // given
+        val a = defaultTestContainer(ContainerStartMode.CREATE_NEW_KILL_EXISTING)
+        a.aptInstall("gpg")
+        a.cmd("gpg --version")   // just for info reasons
+
         // when
-        val fingerprint = Prov.defaultInstance().gpgFingerprint(publicGPGSnakeoilKey())
+        val fingerprint = a.gpgFingerprint(publicGPGSnakeoilKey())
 
         // then
         assertEquals("85052C6954262D61D4E9977E0674104CA81A4905", fingerprint)
diff --git a/src/testFixtures/kotlin/io/provs/test/TestSetup.kt b/src/testFixtures/kotlin/io/provs/test/TestSetup.kt
index b855620..6005a76 100644
--- a/src/testFixtures/kotlin/io/provs/test/TestSetup.kt
+++ b/src/testFixtures/kotlin/io/provs/test/TestSetup.kt
@@ -8,13 +8,11 @@ import io.provs.core.docker.dockerimages.UbuntuPlusUser
 import io.provs.core.processors.ContainerStartMode
 import io.provs.core.processors.ContainerUbuntuHostProcessor
 
-val DEFAULT_START_MODE_TEST_CONTAINER = ContainerStartMode.USE_RUNNING_ELSE_CREATE
-
 val testDockerWithSudo = !"true".equals(System.getProperty("testdockerwithoutsudo")?.toLowerCase())
 
 const val defaultTestContainerName = "provs_test"
 
-fun defaultTestContainer(): Prov {
+fun defaultTestContainer(startMode: ContainerStartMode = ContainerStartMode.USE_RUNNING_ELSE_CREATE): Prov {
     val image = UbuntuPlusUser()
     val prov = testLocal()
     if (!prov.dockerImageExists(image.imageName(), testDockerWithSudo)) {
@@ -24,7 +22,7 @@ fun defaultTestContainer(): Prov {
     return Prov.newInstance(
         ContainerUbuntuHostProcessor(
             defaultTestContainerName,
-            startMode = DEFAULT_START_MODE_TEST_CONTAINER,
+            startMode = startMode,
             sudo = testDockerWithSudo,
             dockerImage = image.imageName()
         ),