1 files changed, 12 insertions, 0 deletions
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
index 21d9b0a7a1f..5ecc33ae964 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
@@ -119,6 +119,18 @@ public abstract class FleetControllerTest implements Waiter {
         testName = name;
     }
 
+    static protected FleetControllerOptions defaultOptions(String clusterName) {
+        var opts = new FleetControllerOptions(clusterName);
+        opts.enableTwoPhaseClusterStateActivation = true; // Enable by default, tests can explicitly disable.
+        return opts;
+    }
+
+    static protected FleetControllerOptions defaultOptions(String clusterName, Collection<ConfiguredNode> nodes) {
+        var opts = new FleetControllerOptions(clusterName, nodes);
+        opts.enableTwoPhaseClusterStateActivation = true; // Enable by default, tests can explicitly disable.
+        return opts;
+    }
+
     protected void setUpSystem(boolean useFakeTimer, FleetControllerOptions options) throws Exception {
         log.log(LogLevel.DEBUG, "Setting up system");
         slobrok = new Slobrok();