diff --git a/feeds_ui/feeds_ui.test b/feeds_ui/feeds_ui.test
index 7378b91..c837825 100644
--- a/feeds_ui/feeds_ui.test
+++ b/feeds_ui/feeds_ui.test
@@ -22,6 +22,19 @@ class FeedsUIUserInterfaceTestCase extends FeedsWebTestCase {
   }
 
   /**
+   * UI functionality tests on disabled feeds.
+   */
+  public function testDisabledFeeds() {
+    $this->createImporterConfiguration('Test feed', 'test_feed');
+    $edit = array(
+      'test_feed' => FALSE,
+    );
+    $this->drupalPost('admin/structure/feeds', $edit, t('Save'));
+    $this->drupalGet('admin/structure/feeds/test_feed');
+    $this->assertNoText('The requested page "/admin/structure/feeds/test_feed" could not be found.');
+  }
+
+  /**
    * UI functionality tests on
    * feeds_ui_overview(),
    * feeds_ui_create_form(),
diff --git a/tests/feeds_scheduler.test b/tests/feeds_scheduler.test
index 3eef89c..2e1c16c 100644
--- a/tests/feeds_scheduler.test
+++ b/tests/feeds_scheduler.test
@@ -79,18 +79,39 @@ class FeedsSchedulerTestCase extends FeedsWebTestCase {
     $this->assertEqual($count, 0, '0 feeds refreshed on cron.');
 
     // Set next time to 0 to simulate updates.
-    // There should be 2 x job_schedule_num (= 10) feeds updated now.
     db_query("UPDATE {job_schedule} SET next = 0");
+
+    // Disable syndication feed so cron doesn't import nodes
+    $this->drupalLogin($this->admin_user);
+    $edit = array(
+      'syndication' => FALSE,
+    );
+    $this->drupalPost('admin/structure/feeds', $edit, t('Save'));
+    $this->drupalLogout();
     $this->cronRun();
-    $this->cronRun();
+    // There should be 0 article nodes in the database.
+    $count = db_query("SELECT COUNT(*) FROM {node} WHERE type = 'article' AND status = 1")->fetchField();
+    $this->assertEqual($count, 0, 'There are 0 article nodes aggregated.');
+
+    // Set next time to 0 to simulate updates.
+    db_query("UPDATE {job_schedule} SET next = 0");
 
+    // Enable syndication feed so cron imports nodes
+    $this->drupalLogin($this->admin_user);
+    $edit = array(
+      'syndication' => TRUE,
+    );
+    $this->drupalPost('admin/structure/feeds', $edit, t('Save'));
+    $this->drupalLogout();
+    $this->cronRun();
+    $this->cronRun();
     // There should be feeds_schedule_num X 2 (= 20) feeds updated now.
     $schedule = array();
     $rows = db_query("SELECT id, last, scheduled FROM {job_schedule} WHERE last > :time", array(':time' => $time));
     foreach ($rows as $row) {
       $schedule[$row->id] = $row;
     }
-    $this->assertEqual(count($schedule), 20, '20 feeds refreshed on cron.' . $count);
+    $this->assertEqual(count($schedule), 20, '20 feeds refreshed on cron.');
 
     // There should be 200 article nodes in the database.
     $count = db_query("SELECT COUNT(*) FROM {node} WHERE type = 'article' AND status = 1")->fetchField();