diff --git a/openidm-provisioner-openicf/src/test/java/org/forgerock/openidm/provisioner/openicf/impl/ConnectorInfoProviderServiceTest.java b/openidm-provisioner-openicf/src/test/java/org/forgerock/openidm/provisioner/openicf/impl/ConnectorInfoProviderServiceTest.java
index f0b894a23..bdfcee892 100644
--- a/openidm-provisioner-openicf/src/test/java/org/forgerock/openidm/provisioner/openicf/impl/ConnectorInfoProviderServiceTest.java
+++ b/openidm-provisioner-openicf/src/test/java/org/forgerock/openidm/provisioner/openicf/impl/ConnectorInfoProviderServiceTest.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openidm.provisioner.openicf.impl;
@@ -202,20 +203,22 @@ public void testGetAllConnectorInfo() throws Exception {
                 .isNotEmpty();
     }
 
-    @Test(enabled = false)
+    @Test
     public void testPropertiesToEncrypt() throws Exception {
+        // The original Solaris connector fixture was removed from the platform; exercise the same
+        // "confidential configuration property" detection path against the Groovy connector, whose
+        // schema marks customSensitiveConfiguration as a GuardedString.
         InputStream inputStream =
                 ConnectorInfoProviderServiceTest.class
-                        .getResourceAsStream("/config/org.forgerock.openidm.provisioner.openicf.impl.OpenICFProvisionerServiceSolarisConnectorTest.json");
+                        .getResourceAsStream("/config/provisioner.openicf-groovy.json");
         assertThat(inputStream).isNotNull();
 
         List<JsonPointer> result =
                 testableConnectorInfoProvider.getPropertiesToEncrypt(OpenICFProvisionerService.PID,
                         null, new JsonValue(mapper.readValue(inputStream, Map.class)));
         String[] expected =
-                new String[] { "/configurationProperties/password",
-                    "/configurationProperties/credentials", "/configurationProperties/privateKey",
-                    "/configurationProperties/passphrase" };
+                new String[] { "/configurationProperties/customSensitiveConfiguration" };
+        assertThat(result).isNotEmpty();
         for (JsonPointer pointer : result) {
             assertThat(expected).contains(pointer.toString());
         }
diff --git a/openidm-provisioner-openicf/src/test/java/org/forgerock/openidm/provisioner/openicf/impl/OpenICFProvisionerServiceTest.java b/openidm-provisioner-openicf/src/test/java/org/forgerock/openidm/provisioner/openicf/impl/OpenICFProvisionerServiceTest.java
index a9f0987d6..f2d84f597 100644
--- a/openidm-provisioner-openicf/src/test/java/org/forgerock/openidm/provisioner/openicf/impl/OpenICFProvisionerServiceTest.java
+++ b/openidm-provisioner-openicf/src/test/java/org/forgerock/openidm/provisioner/openicf/impl/OpenICFProvisionerServiceTest.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.openidm.provisioner.openicf.impl;
 
@@ -852,7 +853,7 @@ public void testSync(String systemName) throws Exception {
     }
 
 
-    @Test(dataProvider = "groovy-only", enabled = false)
+    @Test(dataProvider = "groovy-only")
     public void testPagedSearch(String systemName) throws Exception {
 
         for (int i = 0; i < 100; i++) {
diff --git a/openidm-scheduler/src/test/java/org/forgerock/openidm/scheduler/ScheduleConfigServiceTest.java b/openidm-scheduler/src/test/java/org/forgerock/openidm/scheduler/ScheduleConfigServiceTest.java
index 168ce0074..8311a9296 100644
--- a/openidm-scheduler/src/test/java/org/forgerock/openidm/scheduler/ScheduleConfigServiceTest.java
+++ b/openidm-scheduler/src/test/java/org/forgerock/openidm/scheduler/ScheduleConfigServiceTest.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Portions copyright 2011-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.openidm.scheduler;
 
@@ -47,7 +48,7 @@ public void configParsingTest() throws ResourceException {
         assertThat(scheduleConfig.getStartTime()).isNotNull();
     }
 
-    @Test(enabled = false, expectedExceptions = ResourceException.class)
+    @Test(expectedExceptions = ResourceException.class)
     public void invalidConfigParsingTest() throws ResourceException {
         // Check invalid configuration fails
         Map<String, Object> config = new HashMap<String, Object>();