diff --git a/feeds_import/feeds_import.test b/feeds_import/feeds_import.test
index ee62de0..1e9c12b 100644
--- a/feeds_import/feeds_import.test
+++ b/feeds_import/feeds_import.test
@@ -99,13 +99,29 @@ class FeedsExamplesNodeTestCase extends FeedsWebTestCase {
     $this->assertText('Created 79 nodes');
     $this->assertText('Updated 7 nodes');
 
-    // Import a tab separated file.
+    // Remove all nodes.
     $this->drupalPost('import/node/delete-items', array(), 'Delete');
+    $this->assertText('Deleted 79 nodes');
+    
+    // Import a tab separated file.
     $edit = array(
       'files[feeds]' => $this->absolutePath() . '/tests/feeds/nodes.tsv',
       'feeds[FeedsCSVParser][delimiter]' => "TAB",
     );
     $this->drupalPost('import/node', $edit, 'Import');
+    $this->assertText('Created 9 nodes');
+    
+    // Remove all nodes.
+    $this->drupalPost('import/node/delete-items', array(), 'Delete');
+    $this->assertText('Deleted 9 nodes');
+    
+    // Import a tab separated file with a double quote
+    $this->drupalPost('import/node/delete-items', array(), 'Delete');
+    $edit = array(
+      'files[feeds]' => $this->absolutePath() . '/tests/feeds/nodes_double_quotes.tsv',
+      'feeds[FeedsCSVParser][delimiter]' => "TAB",
+    );
+    $this->drupalPost('import/node', $edit, 'Import');
     $this->assertText('Created 8 nodes');
   }
 }
diff --git a/libraries/ParserCSV.inc b/libraries/ParserCSV.inc
index 1c13dfe..34dd05b 100644
--- a/libraries/ParserCSV.inc
+++ b/libraries/ParserCSV.inc
@@ -256,6 +256,12 @@ class ParserCSV {
         else { // $quoted == FALSE
           // First, let's find out where the next character of interest is.
           $nextQuoteIndex = strpos($line, '"', $currentIndex);
+          // TSV files do not support quoting and do support quotes without
+          // escaping. Therefore, we want to disable quoting regardless if there
+          // is a quote character or not.
+          if ($this->delimiter == "\t") {
+            $nextQuoteIndex = FALSE;
+          }
           $nextDelimiterIndex = strpos($line, $this->delimiter, $currentIndex);
 
           if ($nextQuoteIndex === FALSE) {
diff --git a/tests/feeds/nodes.tsv b/tests/feeds/nodes.tsv
index a3bf82f..406e0fa 100644
--- a/tests/feeds/nodes.tsv
+++ b/tests/feeds/nodes.tsv
@@ -1,10 +1,10 @@
 Title	Body	published	GUID
-"Ut wisi enim ad minim veniam"	"Ut wisi enim ad minim veniam	quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat."	205200720	2
-"Duis autem vel eum iriure dolor"	"Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat	vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi."	428112720	3
-"Nam liber tempor"	"Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum."	1151766000	1
-Typi non habent""	"Typi non habent claritatem insitam; est usus legentis in iis qui facit eorum claritatem."	1256326995	4
-"Lorem ipsum"	"Lorem ipsum dolor sit amet	consectetuer adipiscing elit	sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat."	1251936720	1
-"Investigationes demonstraverunt"	"Investigationes demonstraverunt lectores legere me lius quod ii legunt saepius."	946702800	5
-"Claritas est etiam"	"Claritas est etiam processus dynamicus	qui sequitur mutationem consuetudium lectorum."	438112720	6
-"Mirum est notare"	"Mirum est notare quam littera gothica	quam nunc putamus parum claram	anteposuerit litterarum formas humanitatis per seacula quarta decima et quinta decima."	1151066000	7
-"Eodem modo typi"	"Eodem modo typi	qui nunc nobis videntur parum clari	fiant sollemnes in futurum."	1201936720	8
\ No newline at end of file
+Ut wisi enim ad minim veniam	Ut wisi enim ad minim veniam	quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.	205200720	20
+Duis autem vel eum iriure dolor	Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat	vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.	428112720	21
+Nam liber tempor	Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum.	1151766000	22
+Typi non habent	Typi non habent claritatem insitam; est usus legentis in iis qui facit eorum claritatem.	1256326995	23
+Lorem ipsum	Lorem ipsum dolor sit amet	consectetuer adipiscing elit	sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.	1251936720	24
+Investigationes demonstraverunt	Investigationes demonstraverunt lectores legere me lius quod ii legunt saepius.	946702800	25
+Claritas est etiam  Claritas est etiam processus dynamicus	qui sequitur mutationem consuetudium lectorum.	438112720	26
+Mirum est notare	Mirum est notare quam littera gothica	quam nunc putamus parum claram	anteposuerit litterarum formas humanitatis per seacula quarta decima et quinta decima.	1151066000	27
+Eodem modo typi	Eodem modo typi	qui nunc nobis videntur parum clari	fiant sollemnes in futurum.	1201936720	28
\ No newline at end of file
diff --git a/tests/feeds/nodes_double_quotes.tsv b/tests/feeds/nodes_double_quotes.tsv
new file mode 100644
index 0000000..23cceb2
--- /dev/null
+++ b/tests/feeds/nodes_double_quotes.tsv
@@ -0,0 +1,9 @@
+Title	Body	published	GUID
+894	Main View	205200720	1
+895	Tile Shower	205200721	2
+896	HUGE Closet	205200722	3
+897	Double Vanity	205200723	4
+898	Corian	205200724	5
+899	20" Tile	205200725	6
+900	Bedroom 1	205200726	7
+901	Bedroom 2	205200727	8
\ No newline at end of file