diff --git a/common/src/main/java/org/keycloak/common/Profile.java b/common/src/main/java/org/keycloak/common/Profile.java
index 403fd679a1b..974d03c572c 100755
--- a/common/src/main/java/org/keycloak/common/Profile.java
+++ b/common/src/main/java/org/keycloak/common/Profile.java
@@ -147,7 +147,7 @@ public class Profile {
         ROLLING_UPDATES_V1("Rolling Updates", Type.DEFAULT, 1),
         ROLLING_UPDATES_V2("Rolling Updates for patch releases", Type.PREVIEW, 2),
 
-        WORKFLOWS("Workflows", Type.DEFAULT),
+        WORKFLOWS("Workflows", Type.PREVIEW),
 
         LOG_MDC("Mapped Diagnostic Context (MDC) information in logs", Type.DEFAULT),
 
diff --git a/tests/base/src/test/java/org/keycloak/tests/workflow/WorkflowsBlockingServerConfig.java b/tests/base/src/test/java/org/keycloak/tests/workflow/WorkflowsBlockingServerConfig.java
index 75566bd8a6a..78d971ea806 100644
--- a/tests/base/src/test/java/org/keycloak/tests/workflow/WorkflowsBlockingServerConfig.java
+++ b/tests/base/src/test/java/org/keycloak/tests/workflow/WorkflowsBlockingServerConfig.java
@@ -17,13 +17,12 @@
 
 package org.keycloak.tests.workflow;
 
-import org.keycloak.testframework.server.KeycloakServerConfig;
 import org.keycloak.testframework.server.KeycloakServerConfigBuilder;
 
-public class WorkflowsBlockingServerConfig implements KeycloakServerConfig {
+public class WorkflowsBlockingServerConfig extends WorkflowsServerConfig {
 
     @Override
     public KeycloakServerConfigBuilder configure(KeycloakServerConfigBuilder config) {
-        return config.option("spi-workflow--default--executor-blocking", Boolean.TRUE.toString());
-    }
+        return super.configure(config)
+                .option("spi-workflow--default--executor-blocking", Boolean.TRUE.toString());    }
 }
diff --git a/tests/base/src/test/java/org/keycloak/tests/workflow/WorkflowsScheduledTaskServerConfig.java b/tests/base/src/test/java/org/keycloak/tests/workflow/WorkflowsScheduledTaskServerConfig.java
index 5fb68e6cbc3..4f10268e18b 100644
--- a/tests/base/src/test/java/org/keycloak/tests/workflow/WorkflowsScheduledTaskServerConfig.java
+++ b/tests/base/src/test/java/org/keycloak/tests/workflow/WorkflowsScheduledTaskServerConfig.java
@@ -1,13 +1,13 @@
 package org.keycloak.tests.workflow;
 
 import org.keycloak.models.workflow.WorkflowsEventListenerFactory;
-import org.keycloak.testframework.server.KeycloakServerConfig;
 import org.keycloak.testframework.server.KeycloakServerConfigBuilder;
 
-public class WorkflowsScheduledTaskServerConfig implements KeycloakServerConfig {
+public class WorkflowsScheduledTaskServerConfig extends WorkflowsBlockingServerConfig {
 
     @Override
     public KeycloakServerConfigBuilder configure(KeycloakServerConfigBuilder config) {
-        return config.option("spi-events-listener--" + WorkflowsEventListenerFactory.ID + "--step-runner-task-interval", "1000");
+        return super.configure(config)
+                .option("spi-events-listener--" + WorkflowsEventListenerFactory.ID + "--step-runner-task-interval", "1000");
     }
 }
diff --git a/tests/base/src/test/java/org/keycloak/tests/workflow/WorkflowsServerConfig.java b/tests/base/src/test/java/org/keycloak/tests/workflow/WorkflowsServerConfig.java
new file mode 100644
index 00000000000..8cb00470bea
--- /dev/null
+++ b/tests/base/src/test/java/org/keycloak/tests/workflow/WorkflowsServerConfig.java
@@ -0,0 +1,13 @@
+package org.keycloak.tests.workflow;
+
+import org.keycloak.common.Profile.Feature;
+import org.keycloak.testframework.server.KeycloakServerConfig;
+import org.keycloak.testframework.server.KeycloakServerConfigBuilder;
+
+public class WorkflowsServerConfig implements KeycloakServerConfig {
+
+    @Override
+    public KeycloakServerConfigBuilder configure(KeycloakServerConfigBuilder config) {
+        return config.features(Feature.WORKFLOWS);
+    }
+}