diff --git a/testsuite/standalone/src/test/java/org/wildfly/extras/creaper/commands/transactions/ChangeBasicAttributesOnlineTest.java b/testsuite/standalone/src/test/java/org/wildfly/extras/creaper/commands/transactions/ChangeBasicAttributesOnlineTest.java
index ddfe89d2..e51a4dfe 100644
--- a/testsuite/standalone/src/test/java/org/wildfly/extras/creaper/commands/transactions/ChangeBasicAttributesOnlineTest.java
+++ b/testsuite/standalone/src/test/java/org/wildfly/extras/creaper/commands/transactions/ChangeBasicAttributesOnlineTest.java
@@ -53,6 +53,10 @@ public void startServer() throws IOException, CommandFailedException {
                         .build());
         offlineClient.apply(CONFIGURATION_BACKUP.backup());
         controller.start(ManualTests.ARQUILLIAN_CONTAINER);
+
+        if (onlineClient.version().greaterThanOrEqualTo(ServerVersion.VERSION_5_0_0)) {
+            ops.undefineAttribute(TEST_TRANSACTIONS_ADDRESS, "use-jdbc-store");
+        }
     }
 
     @Test
diff --git a/testsuite/standalone/src/test/java/org/wildfly/extras/creaper/commands/transactions/ChangeJdbcAttributesOnlineTest.java b/testsuite/standalone/src/test/java/org/wildfly/extras/creaper/commands/transactions/ChangeJdbcAttributesOnlineTest.java
index 69304d3e..ae9853ec 100644
--- a/testsuite/standalone/src/test/java/org/wildfly/extras/creaper/commands/transactions/ChangeJdbcAttributesOnlineTest.java
+++ b/testsuite/standalone/src/test/java/org/wildfly/extras/creaper/commands/transactions/ChangeJdbcAttributesOnlineTest.java
@@ -57,6 +57,14 @@ public void startServer() throws IOException, CommandFailedException {
 
     @Test
     @InSequence(2)
+    public void resetStoreSetting() throws Exception {
+        if (onlineClient.version().greaterThanOrEqualTo(ServerVersion.VERSION_5_0_0)) {
+            ops.undefineAttribute(TEST_TRANSACTIONS_ADDRESS, "use-journal-store");
+        }
+    }
+
+    @Test
+    @InSequence(3)
     public void changeAll() throws Exception {
         assumeTrue(onlineClient.version().greaterThanOrEqualTo(ServerVersion.VERSION_1_5_0));
         assumeFalse(onlineClient.version().equals(ServerVersion.VERSION_3_0_0));
@@ -109,7 +117,7 @@ public void changeAll() throws Exception {
     }
 
     @Test
-    @InSequence(3)
+    @InSequence(4)
     public void stopServer() throws CommandFailedException, IOException {
         controller.stop(ManualTests.ARQUILLIAN_CONTAINER);
         offlineClient.apply(CONFIGURATION_BACKUP.restore());
diff --git a/testsuite/standalone/src/test/java/org/wildfly/extras/creaper/commands/transactions/JournalStoreVsJdbcStoreOnlineTest.java b/testsuite/standalone/src/test/java/org/wildfly/extras/creaper/commands/transactions/JournalStoreVsJdbcStoreOnlineTest.java
index 9b705bdd..52d7bb65 100644
--- a/testsuite/standalone/src/test/java/org/wildfly/extras/creaper/commands/transactions/JournalStoreVsJdbcStoreOnlineTest.java
+++ b/testsuite/standalone/src/test/java/org/wildfly/extras/creaper/commands/transactions/JournalStoreVsJdbcStoreOnlineTest.java
@@ -74,6 +74,16 @@ public void enableJournalStore() throws Exception {
 
     @Test
     @InSequence(3)
+    public void resetStoreSetting() throws Exception {
+        if (onlineClient.version().greaterThanOrEqualTo(ServerVersion.VERSION_5_0_0)) {
+            ops.undefineAttribute(TRANSACTIONS_ADDRESS, "use-journal-store");
+            controller.stop(ManualTests.ARQUILLIAN_CONTAINER);
+            controller.start(ManualTests.ARQUILLIAN_CONTAINER);
+        }
+    }
+
+    @Test
+    @InSequence(4)
     public void enableJdbcStore() throws Exception {
         assumeTrue(onlineClient.version().greaterThanOrEqualTo(ServerVersion.VERSION_1_5_0));
         assumeFalse(onlineClient.version().equals(ServerVersion.VERSION_3_0_0));
@@ -90,7 +100,7 @@ public void enableJdbcStore() throws Exception {
     }
 
     @Test
-    @InSequence(4)
+    @InSequence(5)
     public void stopServer() throws CommandFailedException, IOException {
         controller.stop(ManualTests.ARQUILLIAN_CONTAINER);
         offlineClient.apply(CONFIGURATION_BACKUP.restore());