diff -urN feeds.orig/feeds_defaults/tests/feeds_defaults.test feeds/feeds_defaults/tests/feeds_defaults.test
--- feeds.orig/feeds_defaults/tests/feeds_defaults.test	2010-01-12 16:19:43.000000000 +0100
+++ feeds/feeds_defaults/tests/feeds_defaults.test	2010-02-09 23:09:31.000000000 +0100
@@ -131,7 +131,7 @@
 
     // Create a batch of nodes.
     $this->createFeedNodes('feed', 10, 'feed');
-    $count = db_result(db_query('SELECT COUNT(*) from {node} WHERE type = "feed_item"'));
+    $count = db_result(db_query('SELECT COUNT(*) FROM {node} WHERE type = "feed_item"'));
     $this->assertEqual($count, 100, 'Imported 100 nodes.');
     $count = db_result(db_query('SELECT COUNT(*) FROM {feeds_node_item}'));
     $this->assertEqual($count, 100, 'Found 100 records in feeds_node_item.');
diff -urN feeds.orig/tests/feeds.test feeds/tests/feeds.test
--- feeds.orig/tests/feeds.test	2010-01-18 20:20:40.000000000 +0100
+++ feeds/tests/feeds.test	2010-02-09 23:09:31.000000000 +0100
@@ -656,7 +656,7 @@
 
     // There should be feeds_schedule_num (= 10) feeds updated now.
     $schedule = array();
-    $count = db_result(db_query('select COUNT(*) from {feeds_schedule} WHERE last_scheduled_time <> 0'));
+    $count = db_result(db_query('SELECT COUNT(*) FROM {feeds_schedule} WHERE last_scheduled_time <> 0'));
     $this->assertEqual($count, 10, '10 feeds refreshed on cron.');
 
     // There should be 100 story nodes in the database.
@@ -669,7 +669,7 @@
 
     // There should be feeds_schedule_num X 2 (= 20) feeds updated now.
     $schedule = array();
-    $result = db_query('select feed_nid, last_scheduled_time, scheduled from {feeds_schedule} WHERE last_scheduled_time <> 0');
+    $result = db_query('SELECT feed_nid, last_scheduled_time, scheduled FROM {feeds_schedule} WHERE last_scheduled_time <> 0');
     while ($row = db_fetch_object($result)) {
       $schedule[$row->feed_nid] = $row;
     }
@@ -691,7 +691,7 @@
     // The import_period setting of the feed configuration is 1800, there
     // shouldn't be any change to the database now.
     $equal = TRUE;
-    $result = db_query('select feed_nid, last_scheduled_time, scheduled from {feeds_schedule} WHERE last_scheduled_time <> 0');
+    $result = db_query('SELECT feed_nid, last_scheduled_time, scheduled FROM {feeds_schedule} WHERE last_scheduled_time <> 0');
     while ($row = db_fetch_object($result)) {
       $equal = $equal && ($row->last_scheduled_time == $schedule[$row->feed_nid]->last_scheduled_time);
     }
@@ -722,7 +722,7 @@
     // There should not be more nodes than before.
     $equal = FALSE;
     $output = '';
-    $result = db_query('select feed_nid, last_scheduled_time, scheduled from {feeds_schedule} WHERE last_scheduled_time <> 0');
+    $result = db_query('SELECT feed_nid, last_scheduled_time, scheduled FROM {feeds_schedule} WHERE last_scheduled_time <> 0');
     while ($row = db_fetch_object($result)) {
       $equal = $equal || ($row->last_scheduled_time == $schedule[$row->feed_nid]->last_scheduled_time);
     }
diff -urN feeds.orig/tests/feeds.test.inc feeds/tests/feeds.test.inc
--- feeds.orig/tests/feeds.test.inc	2009-12-21 00:48:38.000000000 +0100
+++ feeds/tests/feeds.test.inc	2010-02-09 23:09:31.000000000 +0100
@@ -176,8 +176,8 @@
     $this->assertTrue(is_numeric($nid), 'Found node id ('. $nid .').');
 
     // Check whether feed got recorded in feeds_source table.
-    $this->assertEqual(1, db_result(db_query('select COUNT(*) from {feeds_source} WHERE id = "%s" AND feed_nid = %d', $id, $nid)));
-    $source = db_fetch_object(db_query('select * from {feeds_source} WHERE id = "%s" AND feed_nid = %d', $id, $nid));
+    $this->assertEqual(1, db_result(db_query('SELECT COUNT(*) FROM {feeds_source} WHERE id = "%s" AND feed_nid = %d', $id, $nid)));
+    $source = db_fetch_object(db_query('SELECT * FROM {feeds_source} WHERE id = "%s" AND feed_nid = %d', $id, $nid));
     $config = unserialize($source->config);
     $this->assertEqual($config['FeedsHTTPFetcher']['source'], $feed_url, t('URL in DB correct.'));
 
@@ -209,7 +209,7 @@
     $this->assertText('has been updated.');
 
     // Check that the URL was updated in the feeds_source table.
-    $source = db_fetch_object(db_query('select * from {feeds_source} WHERE feed_nid = %d', $nid));
+    $source = db_fetch_object(db_query('SELECT * FROM {feeds_source} WHERE feed_nid = %d', $nid));
     $config = unserialize($source->config);
     $this->assertEqual($config['FeedsHTTPFetcher']['source'], $feed_url, t('URL in DB correct.'));
   }