diff --git a/tests/Feed/TestFeed.php b/tests/Feed/TestFeed.php
index 133a0f68..9bb5e91d 100644
--- a/tests/Feed/TestFeed.php
+++ b/tests/Feed/TestFeed.php
@@ -81,8 +81,6 @@ class TestFeed extends \PHPUnit\Framework\TestCase {
     function setUp() {
         if(!@file_get_contents(self::$host."IsUp")) {
             $this->markTestSkipped("Test Web server is not accepting requests");
-        } else if(!extension_loaded('curl')) {
-            $this->markTestSkipped("Feed tests are only accurate with curl enabled.");
         }
         $this->base = self::$host."Feed/";
         $this->clearData();
@@ -90,53 +88,6 @@ class TestFeed extends \PHPUnit\Framework\TestCase {
         Data::$db = Phake::mock(Database::class);
     }
 
-    function testHandle400() {
-        $this->assertException("unsupportedFeedFormat", "Feed");
-        new Feed(null, $this->base."Fetching/Error?code=400");
-    }
-
-    function testHandle401() {
-        $this->assertException("unauthorized", "Feed");
-        new Feed(null, $this->base."Fetching/Error?code=401");
-    }
-
-    function testHandle403() {
-        $this->assertException("forbidden", "Feed");
-        new Feed(null, $this->base."Fetching/Error?code=403");
-    }
-
-    function testHandle404() {
-        $this->assertException("invalidUrl", "Feed");
-        new Feed(null, $this->base."Fetching/Error?code=404");
-    }
-
-    function testHandle500() {
-        $this->assertException("unsupportedFeedFormat", "Feed");
-        new Feed(null, $this->base."Fetching/Error?code=500");
-    }
-
-    function testHandleARedirectLoop() {
-        $this->assertException("maxRedirect", "Feed");
-        new Feed(null, $this->base."Fetching/EndlessLoop?i=0");
-    }
-
-    function testHandleATimeout() {
-        Data::$conf->fetchTimeout = 1;
-        $this->assertException("timeout", "Feed");
-        new Feed(null, $this->base."Fetching/Timeout");
-    }
-
-    function testHandleAnOverlyLargeFeed() {
-        Data::$conf->fetchSizeLimit = 512;
-        $this->assertException("maxSize", "Feed");
-        new Feed(null, $this->base."Fetching/TooLarge");
-    }
-
-    function testHandleACertificateError() {
-        $this->assertException("invalidCertificate", "Feed");
-        new Feed(null, "https://localhost:8000/");
-    }
-
     function testParseAFeed() {
         // test that various properties are set on the feed and on items
         $f = new Feed(null, $this->base."Parsing/Valid");
diff --git a/tests/Feed/TestFeedFetching.php b/tests/Feed/TestFeedFetching.php
new file mode 100644
index 00000000..8b038eb1
--- /dev/null
+++ b/tests/Feed/TestFeedFetching.php
@@ -0,0 +1,70 @@
+<?php
+declare(strict_types=1);
+namespace JKingWeb\Arsse;
+Use Phake;
+
+
+class TestFeedFetching extends \PHPUnit\Framework\TestCase {
+    use Test\Tools;
+
+    protected static $host = "http://localhost:8000/";
+    protected $base = "";
+
+    function setUp() {
+        if(!extension_loaded('curl')) {
+            $this->markTestSkipped("Feed fetching tests are only accurate with curl enabled.");
+        } else if(!@file_get_contents(self::$host."IsUp")) {
+            $this->markTestSkipped("Test Web server is not accepting requests");
+        }
+        $this->base = self::$host."Feed/";
+        $this->clearData();
+        Data::$conf = new Conf();
+    }
+
+    function testHandle400() {
+        $this->assertException("unsupportedFeedFormat", "Feed");
+        new Feed(null, $this->base."Fetching/Error?code=400");
+    }
+
+    function testHandle401() {
+        $this->assertException("unauthorized", "Feed");
+        new Feed(null, $this->base."Fetching/Error?code=401");
+    }
+
+    function testHandle403() {
+        $this->assertException("forbidden", "Feed");
+        new Feed(null, $this->base."Fetching/Error?code=403");
+    }
+
+    function testHandle404() {
+        $this->assertException("invalidUrl", "Feed");
+        new Feed(null, $this->base."Fetching/Error?code=404");
+    }
+
+    function testHandle500() {
+        $this->assertException("unsupportedFeedFormat", "Feed");
+        new Feed(null, $this->base."Fetching/Error?code=500");
+    }
+
+    function testHandleARedirectLoop() {
+        $this->assertException("maxRedirect", "Feed");
+        new Feed(null, $this->base."Fetching/EndlessLoop?i=0");
+    }
+
+    function testHandleATimeout() {
+        Data::$conf->fetchTimeout = 1;
+        $this->assertException("timeout", "Feed");
+        new Feed(null, $this->base."Fetching/Timeout");
+    }
+
+    function testHandleAnOverlyLargeFeed() {
+        Data::$conf->fetchSizeLimit = 512;
+        $this->assertException("maxSize", "Feed");
+        new Feed(null, $this->base."Fetching/TooLarge");
+    }
+
+    function testHandleACertificateError() {
+        $this->assertException("invalidCertificate", "Feed");
+        new Feed(null, "https://localhost:8000/");
+    }
+}
\ No newline at end of file
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
index 35201e2c..7366d9bc 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml
@@ -29,6 +29,7 @@
         <file>User/TestAuthorization.php</file>
     </testsuite>
     <testsuite name="Feed parser">
+        <file>Feed/TestFeedFetching.php</file>
         <file>Feed/TestFeed.php</file>
     </testsuite>
     <testsuite name="Database drivers">