diff --git a/src/test/java/com/cloudbees/plugins/credentials/SecretBytesTest.java b/src/test/java/com/cloudbees/plugins/credentials/SecretBytesTest.java
index 1301b67ab..02c72f891 100644
--- a/src/test/java/com/cloudbees/plugins/credentials/SecretBytesTest.java
+++ b/src/test/java/com/cloudbees/plugins/credentials/SecretBytesTest.java
@@ -26,10 +26,8 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Random;
 import jenkins.model.Jenkins;
-import jenkins.security.ConfidentialStoreRule;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang.RandomStringUtils;
-import org.junit.Rule;
 import org.junit.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -38,8 +36,6 @@
 import static org.hamcrest.Matchers.not;
 
 public class SecretBytesTest {
-    @Rule
-    public ConfidentialStoreRule confidentialStore = new ConfidentialStoreRule();
 
     @Test
     public void encrypt() {
diff --git a/src/test/java/jenkins/security/ConfidentialStoreRule.java b/src/test/java/jenkins/security/ConfidentialStoreRule.java
deleted file mode 100644
index 33560428b..000000000
--- a/src/test/java/jenkins/security/ConfidentialStoreRule.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package jenkins.security;
-
-import org.junit.rules.ExternalResource;
-
-import org.junit.rules.TemporaryFolder;
-
-/**
- * Test rule that injects a temporary {@link DefaultConfidentialStore}
- *
- * @author Kohsuke Kawaguchi
- */
-// TODO remove this when available from the test harness
-public class ConfidentialStoreRule extends ExternalResource {
-    private final TemporaryFolder tmp = new TemporaryFolder();
-
-    @Override
-    protected void before() throws Throwable {
-        tmp.create();
-        ConfidentialStore.TEST = new ThreadLocal<>();
-        ConfidentialStore.TEST.set(new DefaultConfidentialStore(tmp.getRoot()));
-    }
-
-    @Override
-    protected void after() {
-        ConfidentialStore.TEST.set(null);
-        ConfidentialStore.TEST = null;
-        tmp.delete();
-    }
-}