diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 7be2b1b143a38aa64b79ed0b2c4f4cfb54b44254..067e1a2efdb5535af30ba3dfb9aa7ec7bb0015ad 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,7 @@
 Feeds 6.x 1.0 XXXXXXXXXXXXXXXXXX
 --------------------------------
 
+- #866492 lyricnz: Clean up tests.
 - #862444 pounard: Do not name files after their enclosure class.
 - #851570 morningtime: Avoid trailing slashes when passing file paths to
   file_check_directory().
diff --git a/tests/feeds_mapper_filefield.test b/tests/feeds_mapper_filefield.test
index 75e042296cb97b8a9c4850cc8ba32e5d4dacdd9a..c8e0599c78c6f2de887fd952da1a0fd0426b3a8f 100644
--- a/tests/feeds_mapper_filefield.test
+++ b/tests/feeds_mapper_filefield.test
@@ -15,7 +15,7 @@ class FeedsMapperFileFieldTestCase extends FeedsMapperTestCase {
   public static function getInfo() {
     return array(
       'name' => t('Mapper: FileField'),
-      'description' => t('Test Feeds Mapper support for FileField CCK fields. <strong>Requires CCK and filefield module</strong>.'),
+      'description' => t('Test Feeds Mapper support for FileField CCK fields. <strong>Requires CCK and filefield module; requires SimplePie library</strong>.'),
       'group' => t('Feeds'),
     );
   }
diff --git a/tests/feeds_mapper_link.test b/tests/feeds_mapper_link.test
index 6155f3938575d7124d305b03dc22e9c046f79961..4e5ff086bc3f243503dfce80c0acd0b7e6a553c3 100644
--- a/tests/feeds_mapper_link.test
+++ b/tests/feeds_mapper_link.test
@@ -22,7 +22,7 @@ class FeedsMapperLinkTestCase extends FeedsMapperTestCase {
   public function setUp() {
     // Call parent setup with the required module
     parent::setUp(
-      'devel', 'feeds', 'feeds_ui', 'ctools', 'content', 'link'
+      'feeds', 'feeds_ui', 'ctools', 'content', 'link'
     );
 
     // Create user and login
@@ -32,7 +32,6 @@ class FeedsMapperLinkTestCase extends FeedsMapperTestCase {
           'administer feeds',
           'administer nodes',
           'administer site configuration',
-          'access devel information'
         )
     ));
   }
diff --git a/tests/feeds_parser_csv.test b/tests/feeds_parser_csv.test
index a62f471028724c0471ccf162d5f9ed5e3af2dcdc..7dd9619b2649802ac63cc6ef624928f25280a871 100644
--- a/tests/feeds_parser_csv.test
+++ b/tests/feeds_parser_csv.test
@@ -28,6 +28,7 @@ class FeedsParserCSVTest extends DrupalWebTestCase  {
    * Test method.
    */
   public function test() {
+    drupal_load('module', 'feeds');
     feeds_include_library('ParserCSV.inc', 'ParserCSV');
 
     $this->_testSimple();