diff --git a/vlib/encoding/csv/csv_test.v b/vlib/encoding/csv/csv_test.v
deleted file mode 100644
index 7442bfce8c..0000000000
--- a/vlib/encoding/csv/csv_test.v
+++ /dev/null
@@ -1,45 +0,0 @@
-import encoding.csv
-
-fn test_encoding_csv_reader() {
-	data := 'name,email,phone,other\njoe,joe@blow.com,0400000000,test\nsam,sam@likesham.com,0433000000,"test quoted field"\n#chris,chris@nomail.com,94444444,"commented row"\n'
-	mut csv_reader := csv.new_reader(data)
-
-	mut row_count := 0
-	for {
-		row := csv_reader.read() or {
-			break
-		}
-		row_count++
-		if row_count== 1 {
-			assert row[0] == 'name'
-			assert row[1] == 'email'
-			assert row[2] == 'phone'
-			assert row[3] == 'other'
-		}
-		if row_count == 2 {
-			assert row[0] == 'joe'
-			assert row[1] == 'joe@blow.com'
-			assert row[2] == '0400000000'
-			assert row[3] == 'test'
-		}
-		if row_count == 3 {
-			assert row[0] == 'sam'
-			assert row[1] == 'sam@likesham.com'
-			assert row[2] == '0433000000'
-			// quoted field
-			assert row[3] == 'test quoted field'
-		}
-	}
-
-	assert row_count == 3
-}
-
-fn test_encoding_csv_writer() {
-	mut csv_writer := csv.new_writer()
-
-	csv_writer.write(['name', 'email', 'phone', 'other']) or {}
-	csv_writer.write(['joe', 'joe@blow.com', '0400000000', 'test']) or {}
-	csv_writer.write(['sam', 'sam@likesham.com', '0433000000', 'needs, quoting']) or {}
-
-	assert csv_writer.str() == 'name,email,phone,other\njoe,joe@blow.com,0400000000,test\nsam,sam@likesham.com,0433000000,"needs, quoting"\n'
-}
diff --git a/vlib/encoding/csv/reader.v b/vlib/encoding/csv/reader.v
index bb6a8c33f0..e6f8441337 100644
--- a/vlib/encoding/csv/reader.v
+++ b/vlib/encoding/csv/reader.v
@@ -77,6 +77,9 @@ fn (r mut Reader) read_line() ?string {
 				// no valid line endings found
 				return err_invalid_le
 			}
+		} else {
+			// No line ending on file
+			i = r.data.len-1
 		}
 	}
 	mut line := r.data[r.row_pos..i]
diff --git a/vlib/encoding/csv/reader_test.v b/vlib/encoding/csv/reader_test.v
new file mode 100644
index 0000000000..21358c9b50
--- /dev/null
+++ b/vlib/encoding/csv/reader_test.v
@@ -0,0 +1,122 @@
+import encoding.csv
+
+fn test_encoding_csv_reader() {
+	data := 'name,email,phone,other\njoe,joe@blow.com,0400000000,test\nsam,sam@likesham.com,0433000000,"test quoted field"\n#chris,chris@nomail.com,94444444,"commented row"\n'
+	mut csv_reader := csv.new_reader(data)
+
+	mut row_count := 0
+	for {
+		row := csv_reader.read() or {
+			break
+		}
+		row_count++
+		if row_count == 1 {
+			assert row[0] == 'name'
+			assert row[1] == 'email'
+			assert row[2] == 'phone'
+			assert row[3] == 'other'
+		}
+		if row_count == 2 {
+			assert row[0] == 'joe'
+			assert row[1] == 'joe@blow.com'
+			assert row[2] == '0400000000'
+			assert row[3] == 'test'
+		}
+		if row_count == 3 {
+			assert row[0] == 'sam'
+			assert row[1] == 'sam@likesham.com'
+			assert row[2] == '0433000000'
+			// quoted field
+			assert row[3] == 'test quoted field'
+		}
+	}
+
+	assert row_count == 3
+}
+
+fn test_line_break_lf() {
+	lf_data := 'name,email\njoe,joe@blow.com\n'
+
+	mut csv_reader := csv.new_reader(lf_data)
+
+	mut row_count := 0
+	for {
+		row := csv_reader.read() or {
+			break
+		}
+		row_count++
+		if row_count == 1 {
+			assert row[0] == 'name'
+			assert row[1] == 'email'
+		}
+		if row_count == 2 {
+			assert row[0] == 'joe'
+			assert row[1] == 'joe@blow.com'
+		}
+	}
+
+	assert row_count == 2
+}
+
+fn test_line_break_cr() {
+	cr_data := 'name,email\rjoe,joe@blow.com\r'
+
+	mut csv_reader := csv.new_reader(cr_data)
+
+	mut row_count := 0
+	for {
+		row := csv_reader.read() or {
+			break
+		}
+		row_count++
+		if row_count == 1 {
+			assert row[0] == 'name'
+			assert row[1] == 'email'
+		}
+		if row_count == 2 {
+			assert row[0] == 'joe'
+			assert row[1] == 'joe@blow.com'
+		}
+	}
+
+	assert row_count == 2
+}
+
+fn test_line_break_crlf() {
+	crlf_data := 'name,email\r\njoe,joe@blow.com\r\n'
+
+	mut csv_reader := csv.new_reader(crlf_data)
+
+	mut row_count := 0
+	for {
+		row := csv_reader.read() or {
+			break
+		}
+		row_count++
+		if row_count == 1 {
+			assert row[0] == 'name'
+			assert row[1] == 'email'
+		}
+		if row_count == 2 {
+			assert row[0] == 'joe'
+			assert row[1] == 'joe@blow.com'
+		}
+	}
+
+	assert row_count == 2
+}
+
+fn test_no_line_ending() {
+	data := 'name,email,phone,other\njoe,joe@blow.com,0400000000,test'
+	mut csv_reader := csv.new_reader(data)
+
+	mut row_count := 0
+	for {
+		row := csv_reader.read() or {
+			break
+		}
+		row_count++
+	}
+
+	assert row_count == 2
+}
\ No newline at end of file
diff --git a/vlib/encoding/csv/writer_test.v b/vlib/encoding/csv/writer_test.v
new file mode 100644
index 0000000000..92882ddc97
--- /dev/null
+++ b/vlib/encoding/csv/writer_test.v
@@ -0,0 +1,11 @@
+import encoding.csv
+
+fn test_encoding_csv_writer() {
+	mut csv_writer := csv.new_writer()
+
+	csv_writer.write(['name', 'email', 'phone', 'other']) or {}
+	csv_writer.write(['joe', 'joe@blow.com', '0400000000', 'test']) or {}
+	csv_writer.write(['sam', 'sam@likesham.com', '0433000000', 'needs, quoting']) or {}
+
+	assert csv_writer.str() == 'name,email,phone,other\njoe,joe@blow.com,0400000000,test\nsam,sam@likesham.com,0433000000,"needs, quoting"\n'
+}