diff --git a/src/test/java/com/rarchives/ripme/tst/proxyTest.java b/src/test/java/com/rarchives/ripme/tst/proxyTest.java
new file mode 100644
index 00000000..32b7958c
--- /dev/null
+++ b/src/test/java/com/rarchives/ripme/tst/proxyTest.java
@@ -0,0 +1,42 @@
+package com.rarchives.ripme.tst;
+
+import java.io.IOException;
+import java.net.URL;
+import com.rarchives.ripme.utils.Proxy;
+import com.rarchives.ripme.utils.Utils;
+import junit.framework.TestCase;
+import com.rarchives.ripme.utils.Http;
+
+
+public class proxyTest  extends TestCase {
+    // This test will only run on machines where the user has added a entry for socks.server
+    public void testSocksProxy() throws IOException {
+        URL url = new URL("https://icanhazip.com");
+        String proxyConfig = Utils.getConfigString("socks.server", "");
+        if (!proxyConfig.equals("")) {
+            String ip1 = Http.url(url).ignoreContentType().get().text();
+            Proxy.setSocks(Utils.getConfigString("socks.server", ""));
+            String ip2 = Http.url(url).ignoreContentType().get().text();
+            assertFalse(ip1.equals(ip2));
+        } else {
+            System.out.println("Skipping testSocksProxy");
+            assert(true);
+        }
+    }
+
+    // This test will only run on machines where the user has added a entry for proxy.server
+    public void testHTTPProxy() throws IOException {
+        URL url = new URL("https://icanhazip.com");
+        String proxyConfig = Utils.getConfigString("proxy.server", "");
+        if (!proxyConfig.equals("")) {
+            String ip1 = Http.url(url).ignoreContentType().get().text();
+            Proxy.setHTTPProxy(Utils.getConfigString("proxy.server", ""));
+            String ip2 = Http.url(url).ignoreContentType().get().text();
+            assertFalse(ip1.equals(ip2));
+        } else {
+            System.out.println("Skipping testHTTPProxy");
+            assert(true);
+        }
+    }
+
+}