diff --git a/mysql-test/ndb/ndb_config_1_node.ini b/mysql-test/ndb/ndb_config_1_node.ini
index a03ca6f1e5e..39e758493c8 100644
--- a/mysql-test/ndb/ndb_config_1_node.ini
+++ b/mysql-test/ndb/ndb_config_1_node.ini
@@ -17,7 +17,7 @@ DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory
 # Increase deadlock-timeout to cater for slow test-machines
 #   (possibly running several tests in parallell)
 #
-TransactionDeadlockDetectionTimeout= 7500
+#TransactionDeadlockDetectionTimeout= 7500
 
 [ndbd]
 HostName= CHOOSE_HOSTNAME_1   # hostname is a valid network adress
diff --git a/mysql-test/ndb/ndb_config_2_node.ini b/mysql-test/ndb/ndb_config_2_node.ini
index 30956ea1323..99f31150d8c 100644
--- a/mysql-test/ndb/ndb_config_2_node.ini
+++ b/mysql-test/ndb/ndb_config_2_node.ini
@@ -20,7 +20,7 @@ InitialNoOfOpenFiles= 27
 # Increase deadlock-timeout to cater for slow test-machines
 #   (possibly running several tests in parallell)
 #
-TransactionDeadlockDetectionTimeout= 7500
+#TransactionDeadlockDetectionTimeout= 7500
 
 [ndbd]
 HostName= CHOOSE_HOSTNAME_1   # hostname is a valid network adress
diff --git a/mysql-test/ndb/ndb_config_4_node.ini b/mysql-test/ndb/ndb_config_4_node.ini
index 78bf7a3a037..94d58bd8efc 100644
--- a/mysql-test/ndb/ndb_config_4_node.ini
+++ b/mysql-test/ndb/ndb_config_4_node.ini
@@ -17,7 +17,7 @@ DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory
 # Increase deadlock-timeout to cater for slow test-machines
 #   (possibly running several tests in parallell)
 #
-TransactionDeadlockDetectionTimeout= 7500
+#TransactionDeadlockDetectionTimeout= 7500
 
 [ndbd]
 HostName= CHOOSE_HOSTNAME_1   # hostname is a valid network adress
diff --git a/mysql-test/t/rpl_ndb_basic.test b/mysql-test/t/rpl_ndb_basic.test
index 18d05c59b0c..5290dc377c2 100644
--- a/mysql-test/t/rpl_ndb_basic.test
+++ b/mysql-test/t/rpl_ndb_basic.test
@@ -116,7 +116,7 @@ UPDATE t1 SET `nom`="DEAD" WHERE `nid`=1;
 # we do this 2 times, once with few retries to verify that we 
 # get a failure with the set sleep, and once with the _same_
 # sleep, but with more retries to get it to succeed
---sleep 15
+--sleep 5
 
 # replication should have stopped, since max retries where not enough
 # verify with show slave status
@@ -131,7 +131,7 @@ set GLOBAL slave_transaction_retries=10;
 START SLAVE;
 # wait for deadlock to be detected and retried
 # should be the same sleep as above for test to be valid
---sleep 15
+--sleep 5
 
 # commit transaction to release lock on row and let replication succeed
 select * from t1 order by nid;