diff --git a/mysql-test/suite/rpl/r/rpl_truncate_7ndb_2.result b/mysql-test/suite/rpl/r/rpl_truncate_7ndb_2.result
deleted file mode 100644
index d43704c2ba7..00000000000
--- a/mysql-test/suite/rpl/r/rpl_truncate_7ndb_2.result
+++ /dev/null
@@ -1,91 +0,0 @@
-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
-**** On Master ****
-CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB;
-INSERT INTO t1 VALUES (1,1), (2,2);
-SELECT * FROM t1 ORDER BY a,b;
-a	b
-1	1
-2	2
-**** On Slave ****
-INSERT INTO t1 VALUE (3,3);
-SELECT * FROM t1 ORDER BY a,b;
-a	b
-1	1
-2	2
-3	3
-**** On Master ****
-TRUNCATE TABLE t1;
-SELECT * FROM t1 ORDER BY a,b;
-a	b
-**** On Slave ****
-SELECT * FROM t1 ORDER BY a,b;
-a	b
-**** On Master ****
-DROP TABLE t1;
-SHOW BINLOG EVENTS;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	4	Format_desc	1	106	Server ver: SERVER_VERSION, Binlog ver: 4
-master-bin.000001	106	Query	1	223	use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB
-master-bin.000001	223	Query	1	287	BEGIN
-master-bin.000001	287	Table_map	1	40	table_id: # (test.t1)
-master-bin.000001	327	Table_map	1	98	table_id: # (mysql.ndb_apply_status)
-master-bin.000001	385	Write_rows	1	157	table_id: #
-master-bin.000001	444	Write_rows	1	204	table_id: # flags: STMT_END_F
-master-bin.000001	491	Query	1	556	COMMIT
-master-bin.000001	556	Query	1	636	use `test`; TRUNCATE TABLE t1
-master-bin.000001	636	Query	1	712	use `test`; DROP TABLE t1
-**** On Master ****
-CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB;
-INSERT INTO t1 VALUES (1,1), (2,2);
-SELECT * FROM t1 ORDER BY a,b;
-a	b
-1	1
-2	2
-**** On Slave ****
-INSERT INTO t1 VALUE (3,3);
-SELECT * FROM t1 ORDER BY a,b;
-a	b
-1	1
-2	2
-3	3
-**** On Master ****
-DELETE FROM t1;
-SELECT * FROM t1 ORDER BY a,b;
-a	b
-**** On Slave ****
-SELECT * FROM t1 ORDER BY a,b;
-a	b
-3	3
-**** On Master ****
-DROP TABLE t1;
-SHOW BINLOG EVENTS;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	4	Format_desc	1	106	Server ver: SERVER_VERSION, Binlog ver: 4
-master-bin.000001	106	Query	1	223	use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB
-master-bin.000001	223	Query	1	287	BEGIN
-master-bin.000001	287	Table_map	1	40	table_id: # (test.t1)
-master-bin.000001	327	Table_map	1	98	table_id: # (mysql.ndb_apply_status)
-master-bin.000001	385	Write_rows	1	157	table_id: #
-master-bin.000001	444	Write_rows	1	204	table_id: # flags: STMT_END_F
-master-bin.000001	491	Query	1	556	COMMIT
-master-bin.000001	556	Query	1	636	use `test`; TRUNCATE TABLE t1
-master-bin.000001	636	Query	1	712	use `test`; DROP TABLE t1
-master-bin.000001	712	Query	1	829	use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB
-master-bin.000001	829	Query	1	893	BEGIN
-master-bin.000001	893	Table_map	1	40	table_id: # (test.t1)
-master-bin.000001	933	Table_map	1	98	table_id: # (mysql.ndb_apply_status)
-master-bin.000001	991	Write_rows	1	157	table_id: #
-master-bin.000001	1050	Write_rows	1	204	table_id: # flags: STMT_END_F
-master-bin.000001	1097	Query	1	1162	COMMIT
-master-bin.000001	1162	Query	1	1226	BEGIN
-master-bin.000001	1226	Table_map	1	40	table_id: # (test.t1)
-master-bin.000001	1266	Table_map	1	98	table_id: # (mysql.ndb_apply_status)
-master-bin.000001	1324	Write_rows	1	157	table_id: #
-master-bin.000001	1383	Delete_rows	1	196	table_id: # flags: STMT_END_F
-master-bin.000001	1422	Query	1	1487	COMMIT
-master-bin.000001	1487	Query	1	1563	use `test`; DROP TABLE t1
diff --git a/mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result b/mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result
new file mode 100644
index 00000000000..d6c57aed41b
--- /dev/null
+++ b/mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result
@@ -0,0 +1,91 @@
+stop slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+start slave;
+**** On Master ****
+CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB;
+INSERT INTO t1 VALUES (1,1), (2,2);
+SELECT * FROM t1 ORDER BY a,b;
+a	b
+1	1
+2	2
+**** On Slave ****
+INSERT INTO t1 VALUE (3,3);
+SELECT * FROM t1 ORDER BY a,b;
+a	b
+1	1
+2	2
+3	3
+**** On Master ****
+TRUNCATE TABLE t1;
+SELECT * FROM t1 ORDER BY a,b;
+a	b
+**** On Slave ****
+SELECT * FROM t1 ORDER BY a,b;
+a	b
+**** On Master ****
+DROP TABLE t1;
+SHOW BINLOG EVENTS;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	4	Format_desc	1	106	Server ver: SERVER_VERSION, Binlog ver: 4
+master-bin.000001	106	Query	1	223	use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB
+master-bin.000001	223	Query	1	287	BEGIN
+master-bin.000001	287	Table_map	1	330	table_id: # (test.t1)
+master-bin.000001	330	Table_map	1	392	table_id: # (mysql.ndb_apply_status)
+master-bin.000001	392	Write_rows	1	451	table_id: #
+master-bin.000001	451	Write_rows	1	498	table_id: # flags: STMT_END_F
+master-bin.000001	498	Query	1	563	COMMIT
+master-bin.000001	563	Query	1	643	use `test`; TRUNCATE TABLE t1
+master-bin.000001	643	Query	1	719	use `test`; DROP TABLE t1
+**** On Master ****
+CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB;
+INSERT INTO t1 VALUES (1,1), (2,2);
+SELECT * FROM t1 ORDER BY a,b;
+a	b
+1	1
+2	2
+**** On Slave ****
+INSERT INTO t1 VALUE (3,3);
+SELECT * FROM t1 ORDER BY a,b;
+a	b
+1	1
+2	2
+3	3
+**** On Master ****
+DELETE FROM t1;
+SELECT * FROM t1 ORDER BY a,b;
+a	b
+**** On Slave ****
+SELECT * FROM t1 ORDER BY a,b;
+a	b
+3	3
+**** On Master ****
+DROP TABLE t1;
+SHOW BINLOG EVENTS;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	4	Format_desc	1	106	Server ver: SERVER_VERSION, Binlog ver: 4
+master-bin.000001	106	Query	1	223	use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB
+master-bin.000001	223	Query	1	287	BEGIN
+master-bin.000001	287	Table_map	1	330	table_id: # (test.t1)
+master-bin.000001	330	Table_map	1	392	table_id: # (mysql.ndb_apply_status)
+master-bin.000001	392	Write_rows	1	451	table_id: #
+master-bin.000001	451	Write_rows	1	498	table_id: # flags: STMT_END_F
+master-bin.000001	498	Query	1	563	COMMIT
+master-bin.000001	563	Query	1	643	use `test`; TRUNCATE TABLE t1
+master-bin.000001	643	Query	1	719	use `test`; DROP TABLE t1
+master-bin.000001	719	Query	1	836	use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB
+master-bin.000001	836	Query	1	900	BEGIN
+master-bin.000001	900	Table_map	1	943	table_id: # (test.t1)
+master-bin.000001	943	Table_map	1	1005	table_id: # (mysql.ndb_apply_status)
+master-bin.000001	1005	Write_rows	1	1064	table_id: #
+master-bin.000001	1064	Write_rows	1	1111	table_id: # flags: STMT_END_F
+master-bin.000001	1111	Query	1	1176	COMMIT
+master-bin.000001	1176	Query	1	1240	BEGIN
+master-bin.000001	1240	Table_map	1	1283	table_id: # (test.t1)
+master-bin.000001	1283	Table_map	1	1345	table_id: # (mysql.ndb_apply_status)
+master-bin.000001	1345	Write_rows	1	1404	table_id: #
+master-bin.000001	1404	Delete_rows	1	1443	table_id: # flags: STMT_END_F
+master-bin.000001	1443	Query	1	1508	COMMIT
+master-bin.000001	1508	Query	1	1584	use `test`; DROP TABLE t1
diff --git a/mysql-test/suite/rpl/t/rpl_truncate_7ndb_2-master.opt b/mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt
similarity index 100%
rename from mysql-test/suite/rpl/t/rpl_truncate_7ndb_2-master.opt
rename to mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt
diff --git a/mysql-test/suite/rpl/t/rpl_truncate_7ndb_2.test b/mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test
similarity index 55%
rename from mysql-test/suite/rpl/t/rpl_truncate_7ndb_2.test
rename to mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test
index 5381dff95a3..549227db61a 100644
--- a/mysql-test/suite/rpl/t/rpl_truncate_7ndb_2.test
+++ b/mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test
@@ -1,6 +1,11 @@
 # Same test as rpl_truncate_7ndb.test, but with mixed mode
 # This is marked with 'big_test' just because the rpl_truncate_7ndb test is
 # so slow...
+
+# Last Change:  2008-09-03
+# Change Author:  pcrews
+# Change:  Moved test to rpl_ndb suite, updated location of --source .test file
+
 --source include/have_binlog_format_mixed.inc
 --source include/big_test.inc
---source t/rpl_truncate_7ndb.test
+--source suite/rpl_ndb/t/rpl_truncate_7ndb.test