diff --git a/mysql-test/r/ipv4_and_ipv6.result b/mysql-test/r/ipv4_and_ipv6.result
index 96a70b71717..f15aeba65fa 100644
--- a/mysql-test/r/ipv4_and_ipv6.result
+++ b/mysql-test/r/ipv4_and_ipv6.result
@@ -56,32 +56,3 @@ SELECT USER();
 USER()
 root@localhost
 DROP USER testuser1@'127.0.0.1';
-=============Test of '0:0:0:0:0:FFFF:127.0.0.1' ===================
-mysqld is alive
-CREATE USER testuser@'0:0:0:0:0:FFFF:127.0.0.1' identified by '1234';
-GRANT ALL ON test.* TO testuser@'0:0:0:0:0:FFFF:127.0.0.1';
-SHOW GRANTS FOR testuser@'0:0:0:0:0:FFFF:127.0.0.1';
-Grants for testuser@0:0:0:0:0:ffff:127.0.0.1
-GRANT USAGE ON *.* TO 'testuser'@'0:0:0:0:0:ffff:127.0.0.1' IDENTIFIED BY PASSWORD '*A4B6157319038724E3560894F7F932C8886EBFCF'
-GRANT ALL PRIVILEGES ON `test`.* TO 'testuser'@'0:0:0:0:0:ffff:127.0.0.1'
-SET @nip= inet_aton('0:0:0:0:0:FFFF:127.0.0.1');
-SELECT @nip;
-@nip
-NULL
-SELECT inet_ntoa(@nip);
-inet_ntoa(@nip)
-NULL
-SELECT USER();
-USER()
-root@localhost
-SELECT current_user();
-current_user()
-root@localhost
-SHOW PROCESSLIST;
-REVOKE ALL ON test.* FROM testuser@'0:0:0:0:0:FFFF:127.0.0.1';
-RENAME USER testuser@'0:0:0:0:0:FFFF:127.0.0.1' to testuser1@'0:0:0:0:0:FFFF:127.0.0.1';
-SET PASSWORD FOR testuser1@'0:0:0:0:0:FFFF:127.0.0.1' = PASSWORD ('9876');
-SELECT USER();
-USER()
-root@localhost
-DROP USER testuser1@'0:0:0:0:0:FFFF:127.0.0.1';
diff --git a/mysql-test/t/ipv4_and_ipv6.test b/mysql-test/t/ipv4_and_ipv6.test
index d52945f17fa..19ab4a253cc 100644
--- a/mysql-test/t/ipv4_and_ipv6.test
+++ b/mysql-test/t/ipv4_and_ipv6.test
@@ -11,8 +11,3 @@ let $IPv6= 127.0.0.1;
 --source include/ipv6_clients.inc
 --source include/ipv6.inc
 
-echo =============Test of '0:0:0:0:0:FFFF:127.0.0.1' ===================;
-let $IPv6= 0:0:0:0:0:FFFF:127.0.0.1;
---source include/ipv6_clients.inc
---source include/ipv6.inc
-