diff --git a/nifi-bootstrap/src/test/resources/existing-keystore.p12 b/nifi-bootstrap/src/test/resources/existing-keystore.p12
deleted file mode 100644
index a8b1563ed5a9a..0000000000000
Binary files a/nifi-bootstrap/src/test/resources/existing-keystore.p12 and /dev/null differ
diff --git a/nifi-bootstrap/src/test/resources/existing-truststore.p12 b/nifi-bootstrap/src/test/resources/existing-truststore.p12
deleted file mode 100644
index 4ab5751f92a72..0000000000000
Binary files a/nifi-bootstrap/src/test/resources/existing-truststore.p12 and /dev/null differ
diff --git a/nifi-mock/src/main/java/org/apache/nifi/state/MockStateManager.java b/nifi-mock/src/main/java/org/apache/nifi/state/MockStateManager.java
index c554489d50f09..d649b17bf5dfd 100644
--- a/nifi-mock/src/main/java/org/apache/nifi/state/MockStateManager.java
+++ b/nifi-mock/src/main/java/org/apache/nifi/state/MockStateManager.java
@@ -30,6 +30,7 @@
 import java.util.concurrent.atomic.AtomicLong;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class MockStateManager implements StateManager {
     private final AtomicInteger versionIndex = new AtomicInteger(0);
@@ -262,7 +263,7 @@ public void assertStateNotSet(final String key, final Scope scope) {
      */
     public void assertStateSet(final Scope scope) {
         final StateMap stateMap = (scope == Scope.CLUSTER) ? clusterStateMap : localStateMap;
-        assertFalse(stateMap.getStateVersion().isPresent(), "Expected state to be set for Scope " + scope + ", but it was not set");
+        assertTrue(stateMap.getStateVersion().isPresent(), "Expected state to be set for Scope " + scope + ", but it was not set");
     }
 
     /**