diff --git a/src/main/java/net/sourceforge/plantuml/servlet/ProxyServlet.java b/src/main/java/net/sourceforge/plantuml/servlet/ProxyServlet.java
index a6f1d31..0a7e026 100644
--- a/src/main/java/net/sourceforge/plantuml/servlet/ProxyServlet.java
+++ b/src/main/java/net/sourceforge/plantuml/servlet/ProxyServlet.java
@@ -63,16 +63,7 @@ public class ProxyServlet extends HttpServlet {
         }
     }
 
-    private static boolean inTest = false;
-
-    public static void goTest() {
-        inTest = true;
-    }
-
     public static boolean forbiddenURL(String full) {
-        if (inTest) {
-            return false;
-        }
         if (full == null) {
             return true;
         }
diff --git a/src/test/java/net/sourceforge/plantuml/servlet/TestOldProxy.java b/src/test/java/net/sourceforge/plantuml/servlet/TestOldProxy.java
deleted file mode 100644
index c08674b..0000000
--- a/src/test/java/net/sourceforge/plantuml/servlet/TestOldProxy.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package net.sourceforge.plantuml.servlet;
-
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLConnection;
-
-
-public class TestOldProxy extends WebappTestCase {
-
-    /**
-     * Verifies the proxified reception of the default Bob and Alice diagram
-     */
-    public void testDefaultProxy() throws IOException {
-        final URL url = new URL(getServerUrl() + "/proxy/" + getServerUrl() + "/resource/test2diagrams.txt");
-        final URLConnection conn = url.openConnection();
-        // Analyze response
-        // Verifies the Content-Type header
-        assertEquals(
-            "Response content type is not PNG",
-            "image/png",
-            conn.getContentType().toLowerCase()
-        );
-        // Get the image and verify its size (~2000 bytes)
-        byte[] inMemoryImage = getContentAsBytes(conn);
-        int diagramLen = inMemoryImage.length;
-        assertTrue(diagramLen > 2000);
-        assertTrue(diagramLen < 3000);
-    }
-
-    public void testProxyWithFormat() throws IOException {
-        final URL url = new URL(getServerUrl() + "/proxy/svg/" + getServerUrl() + "/resource/test2diagrams.txt");
-        final URLConnection conn = url.openConnection();
-        // Analyze response
-        // Verifies the Content-Type header
-        assertEquals(
-            "Response content type is not SVG",
-            "image/svg+xml",
-            conn.getContentType().toLowerCase()
-        );
-        // Get the content and verify its size
-        String diagram = getContentText(conn);
-        int diagramLen = diagram.length();
-        assertTrue(diagramLen > 1000);
-        assertTrue(diagramLen < 3000);
-    }
-
-    /**
-     * Verifies that the HTTP header of a diagram incites the browser to cache it.
-     */
-    public void testInvalidUrl() throws IOException {
-        final URL url = new URL(getServerUrl() + "/proxy/invalidURL");
-        final HttpURLConnection conn = (HttpURLConnection)url.openConnection();
-        // Analyze response
-        // Get the content and verify its size
-        assertEquals(
-            "Response is not empty",
-            0,
-            conn.getContentLength()
-        );
-        // Check if status code is 400
-        assertEquals(
-            "Bad HTTP status received",
-            400,
-            conn.getResponseCode()
-        );
-    }
-
-}
diff --git a/src/test/java/net/sourceforge/plantuml/servlet/TestProxy.java b/src/test/java/net/sourceforge/plantuml/servlet/TestProxy.java
deleted file mode 100644
index 3e2e1a7..0000000
--- a/src/test/java/net/sourceforge/plantuml/servlet/TestProxy.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package net.sourceforge.plantuml.servlet;
-
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLConnection;
-
-
-public class TestProxy extends WebappTestCase {
-
-    /**
-     * Verifies the proxified reception of the default Bob and Alice diagram
-     */
-    public void testDefaultProxy() throws IOException {
-        net.sourceforge.plantuml.servlet.ProxyServlet.goTest();
-        final URL url = new URL(getServerUrl() + "/proxy?src=" + getServerUrl() + "/resource/test2diagrams.txt");
-        final URLConnection conn = url.openConnection();
-        // Analyze response
-        // Verifies the Content-Type header
-        assertEquals(
-            "Response content type is not PNG",
-            "image/png",
-            conn.getContentType().toLowerCase()
-        );
-        // Get the image and verify its size (~2000 bytes)
-        byte[] inMemoryImage = getContentAsBytes(conn);
-        int diagramLen = inMemoryImage.length;
-        assertTrue(diagramLen > 2000);
-        assertTrue(diagramLen < 3000);
-    }
-
-    /**
-     * Verifies the proxified reception of the default Bob and Alice diagram with defined format.
-     */
-    public void testProxyWithFormat() throws IOException {
-        final URL url = new URL(getServerUrl() + "/proxy?fmt=svg&src=" + getServerUrl() + "/resource/test2diagrams.txt");
-        final URLConnection conn = url.openConnection();
-        // Analyze response
-        // Verifies the Content-Type header
-        assertEquals(
-            "Response content type is not SVG",
-            "image/svg+xml",
-            conn.getContentType().toLowerCase()
-        );
-        // Get the content and verify its size
-        String diagram = getContentText(conn);
-        int diagramLen = diagram.length();
-        assertTrue(diagramLen > 2000);
-        assertTrue(diagramLen < 3000);
-    }
-
-    /**
-     * Verifies the proxified reception of the default Bob and Alice diagram with defined format and format (idx=0).
-     */
-    public void testProxyWithFormatIdx0() throws IOException {
-        final URL url = new URL(getServerUrl() + "/proxy?fmt=svg&idx=0&src=" + getServerUrl() + "/resource/test2diagrams.txt");
-        final URLConnection conn = url.openConnection();
-        // Analyze response
-        // Verifies the Content-Type header
-        assertEquals(
-            "Response content type is not SVG",
-            "image/svg+xml",
-            conn.getContentType().toLowerCase()
-        );
-        // Get the content and verify its size
-        String diagram = getContentText(conn);
-        int diagramLen = diagram.length();
-        assertTrue(diagramLen > 2000);
-        assertTrue(diagramLen < 3000);
-    }
-
-    /**
-     * Verifies the proxified reception of the default Bob and Alice diagram with defined format and format (idx=1).
-     */
-    public void testProxyWithFormatIdx1() throws IOException {
-        final URL url = new URL(getServerUrl() + "/proxy?fmt=svg&idx=1&src=" + getServerUrl() + "/resource/test2diagrams.txt");
-        final URLConnection conn = url.openConnection();
-        // Analyze response
-        // Verifies the Content-Type header
-        assertEquals(
-            "Response content type is not SVG",
-            "image/svg+xml",
-            conn.getContentType().toLowerCase()
-        );
-        // Get the content and verify its size
-        String diagram = getContentText(conn);
-        int diagramLen = diagram.length();
-        assertTrue(diagramLen > 5000);
-        assertTrue(diagramLen < 6000);
-    }
-
-    /**
-     * Verifies that the HTTP header of a diagram incites the browser to cache it.
-     */
-    public void testInvalidUrl() throws IOException {
-        final URL url = new URL(getServerUrl() + "/proxy?src=invalidURL");
-        final HttpURLConnection conn = (HttpURLConnection)url.openConnection();
-        // Analyze response, it must be HTTP error 400
-        assertEquals(
-            "Bad HTTP status received",
-            400,
-            conn.getResponseCode()
-        );
-    }
-
-}