diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/video/SpankbangRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/SpankbangRipper.java
similarity index 64%
rename from src/main/java/com/rarchives/ripme/ripper/rippers/video/SpankbangRipper.java
rename to src/main/java/com/rarchives/ripme/ripper/rippers/SpankbangRipper.java
index 39e8ca9d..bca5ef66 100644
--- a/src/main/java/com/rarchives/ripme/ripper/rippers/video/SpankbangRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/rippers/SpankbangRipper.java
@@ -1,18 +1,21 @@
-package com.rarchives.ripme.ripper.rippers.video;
+package com.rarchives.ripme.ripper.rippers;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import com.rarchives.ripme.ripper.AbstractSingleFileRipper;
 import org.jsoup.nodes.Document;
 import org.jsoup.select.Elements;
 
 import com.rarchives.ripme.ripper.VideoRipper;
 import com.rarchives.ripme.utils.Http;
 
-public class SpankbangRipper extends VideoRipper {
+public class SpankbangRipper extends AbstractSingleFileRipper {
 
     private static final String HOST = "spankbang";
 
@@ -20,6 +23,29 @@ public class SpankbangRipper extends VideoRipper {
         super(url);
     }
 
+    @Override
+    public String getDomain() {
+        return "spankbang.com";
+    }
+
+    @Override
+    public Document getFirstPage() throws IOException {
+        return Http.url(url).get();
+    }
+
+    @Override
+    public List<String> getURLsFromPage(Document doc) {
+        List<String> result = new ArrayList<>();
+        Elements videos = doc.select(".video-js > source");
+        if (videos.isEmpty()) {
+            LOGGER.error("Could not find Embed code at " + url);
+            return null;
+        }
+        result.add(videos.attr("src"));
+        return result;
+    }
+
+
     @Override
     public String getHost() {
         return HOST;
@@ -52,15 +78,7 @@ public class SpankbangRipper extends VideoRipper {
     }
 
     @Override
-    public void rip() throws IOException {
-        LOGGER.info("Retrieving " + this.url);
-        Document doc = Http.url(url).get();
-        Elements videos = doc.select(".video-js > source");
-        if (videos.isEmpty()) {
-            throw new IOException("Could not find Embed code at " + url);
-        }
-        String vidUrl = videos.attr("src");
-        addURLToDownload(new URL(vidUrl), HOST + "_" + getGID(this.url));
-        waitForThreads();
+    public void downloadURL(URL url, int index) {
+        addURLToDownload(url, getPrefix(index));
     }
 }
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/SpankBangRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/SpankBangRipperTest.java
index 689c94e8..19727e65 100644
--- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/SpankBangRipperTest.java
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/SpankBangRipperTest.java
@@ -3,16 +3,13 @@ package com.rarchives.ripme.tst.ripper.rippers;
 import java.io.IOException;
 import java.net.URL;
 
-import com.rarchives.ripme.ripper.rippers.video.SpankbangRipper;
-import com.rarchives.ripme.utils.Utils;
+import com.rarchives.ripme.ripper.rippers.SpankbangRipper;
 
 public class SpankBangRipperTest extends RippersTest {
+
     public void testSpankBangVideo() throws IOException {
-        // This test fails on the CI so we skip it unless running locally
-        if (Utils.getConfigBoolean("test.run_flaky_tests", false)) {
-            SpankbangRipper ripper = new SpankbangRipper(new URL("https://spankbang.com/2a7fh/video/mdb901"));  //most popular video of all time on site; should stay up
-            testRipper(ripper);
-        }
+        SpankbangRipper ripper = new SpankbangRipper(new URL("https://spankbang.com/2a7fh/video/mdb901"));  //most popular video of all time on site; should stay up
+        testRipper(ripper);
     }
 
 }