diff --git a/mysql-test/include/rpl_end.inc b/mysql-test/include/rpl_end.inc
index 3fdd91ba319..4719ef16ccf 100644
--- a/mysql-test/include/rpl_end.inc
+++ b/mysql-test/include/rpl_end.inc
@@ -103,11 +103,9 @@ while ($_rpl_server)
 
 --connection default
 --let $_rpl_server= $rpl_server_count
---let $_rpl_one= _1
 while ($_rpl_server)
 {
   --disconnect server_$_rpl_server
-  --disconnect server_$_rpl_server$_rpl_one
   --dec $_rpl_server
 }
 
diff --git a/mysql-test/include/rpl_init.inc b/mysql-test/include/rpl_init.inc
index dfd5e668e1d..bfb1fc3f60b 100644
--- a/mysql-test/include/rpl_init.inc
+++ b/mysql-test/include/rpl_init.inc
@@ -3,10 +3,7 @@
 # Set up replication on several servers in a specified topology.
 #
 # By default, this script does the following:
-#  - Creates the connections server_1, server_2, ..., server_N, as
-#    well as extra connections server_1_1, server_2_1, ...,
-#    server_N_1. server_I and server_I_1 are connections to the same
-#    server.
+#  - Creates the connections server_1, server_2, ..., server_N.
 #  - Calls RESET MASTER, RESET SLAVE, USE test, CHANGE MASTER, START SLAVE.
 #  - Sets the connection to server_1 before exiting.
 # With $rpl_check_server_ids parameter, the script does the following:
@@ -143,18 +140,15 @@ if (!$rpl_debug)
 }
 
 
-# Create two connections to each server; reset master/slave, select
+# Create connection to the server; reset master/slave, select
 # database, set autoinc variables.
 --let $_rpl_server= $rpl_server_count
---let $_rpl_one= _1
 while ($_rpl_server)
 {
   # Connect.
   --let $rpl_server_number= $_rpl_server
   --let $rpl_connection_name= server_$_rpl_server
   --source include/rpl_connect.inc
-  --let $rpl_connection_name= server_$_rpl_server$_rpl_one
-  --source include/rpl_connect.inc
 
   # Configure server.
   --let $rpl_connection_name= server_$_rpl_server
diff --git a/mysql-test/include/rpl_reconnect.inc b/mysql-test/include/rpl_reconnect.inc
index cdbbd0a1bf1..9438c774461 100644
--- a/mysql-test/include/rpl_reconnect.inc
+++ b/mysql-test/include/rpl_reconnect.inc
@@ -72,11 +72,6 @@ if (!$_rpl_server_number)
 --source include/rpl_connection.inc
 --enable_reconnect
 
---let $_rpl_one= _1
---let $rpl_connection_name= server_$rpl_server_number$_rpl_one
---source include/rpl_connection.inc
---enable_reconnect
-
 if ($rpl_debug)
 {
   --echo ---- Wait for reconnect and disable reconnect on all connections ----
@@ -122,11 +117,5 @@ if (!$_rpl_server_number)
 --source include/wait_until_connected_again.inc
 --disable_reconnect
 
---let $rpl_connection_name= server_$rpl_server_number$_rpl_one
---source include/rpl_connection.inc
---source include/wait_until_connected_again.inc
---disable_reconnect
-
-
 --let $include_filename= rpl_reconnect.inc
 --source include/end_include_file.inc