diff --git a/src/de/steamwar/bungeecore/SubserverSystem.java b/src/de/steamwar/bungeecore/SubserverSystem.java
index f981f5a..310e0f6 100644
--- a/src/de/steamwar/bungeecore/SubserverSystem.java
+++ b/src/de/steamwar/bungeecore/SubserverSystem.java
@@ -84,6 +84,13 @@ public class SubserverSystem {
                 MC_SCRIPT, "-a", m.name(), p.getName(), Integer.toString(port), map, "-1").sendPlayer(p);
     }
 
+    public static void sendToHistoricTestServer(ProxiedPlayer p, ArenaMode m, String map){
+        int port = freePort(4000);
+
+        new Bauserver(p.getName() + "s Bau", p.getUniqueId(), port,
+                MC_SCRIPT, "-h", m.name(), p.getName(), Integer.toString(port), map, "-1").sendPlayer(p);
+    }
+
     private static int freePort(int start){
         int port = start;
         boolean isFree = false;
diff --git a/src/de/steamwar/bungeecore/commands/BauCommand.java b/src/de/steamwar/bungeecore/commands/BauCommand.java
index 3c515dd..b401d55 100644
--- a/src/de/steamwar/bungeecore/commands/BauCommand.java
+++ b/src/de/steamwar/bungeecore/commands/BauCommand.java
@@ -196,7 +196,10 @@ public class BauCommand {
                     break;
                 }
             }
-            SubserverSystem.sendToTestServer(p, mode, FightCommand.getMap(p, mode, new String[0]));
+            if(mode == ArenaMode.WarGear7)
+                SubserverSystem.sendToHistoricTestServer(p, mode, FightCommand.getMap(p, mode, new String[0]));
+            else
+                SubserverSystem.sendToTestServer(p, mode, FightCommand.getMap(p, mode, new String[0]));
         });
     }