diff --git a/engine/common/masterlist.c b/engine/common/masterlist.c
index 7225a6ff..d83c865d 100644
--- a/engine/common/masterlist.c
+++ b/engine/common/masterlist.c
@@ -419,6 +419,8 @@ void NET_InitMasters( void )
 
 	// keep main master always there
 	NET_AddMaster( MASTERSERVER_ADR, false );
-	NET_AddMaster( MASTERSERVER_ADR_TEST, false );
+	NET_AddMaster( "aaaa.mentality.rip:27010", false ); // IPv6-only
+	NET_AddMaster( "mentality.rip:27011", false );
+
 	NET_LoadMasters( );
 }
diff --git a/engine/common/netchan.h b/engine/common/netchan.h
index fd69fd7a..a1c3cbd3 100644
--- a/engine/common/netchan.h
+++ b/engine/common/netchan.h
@@ -70,7 +70,6 @@ GNU General Public License for more details.
 #define NET_MAX_MESSAGE		PAD_NUMBER(( NET_MAX_PAYLOAD + HEADER_BYTES ), 16 )
 
 #define MASTERSERVER_ADR		"mentality.rip:27010"
-#define MASTERSERVER_ADR_TEST	"mentality.rip:27011"
 #define MS_SCAN_REQUEST		"1\xFF" "0.0.0.0:0\0"
 
 #define PORT_MASTER			27010