diff --git a/js/client/modules/@arangodb/testing.js b/js/client/modules/@arangodb/testing.js
index 77d57ba851..ad14978c90 100644
--- a/js/client/modules/@arangodb/testing.js
+++ b/js/client/modules/@arangodb/testing.js
@@ -3227,6 +3227,14 @@ const impTodos = [{
   create: 'true',
   separator: ';',
   backslash: true
+}, {
+  id: 'csvnoeol',
+  data: makePathUnix('js/common/test-data/import/import-noeol.csv'),
+  coll: 'UnitTestsImportCsvNoEol',
+  type: 'csv',
+  create: 'true',
+  separator: ',',
+  backslash: true
 }, {
   id: 'tsv1',
   data: makePathUnix('js/common/test-data/import/import-1.tsv'),
diff --git a/js/common/test-data/import/import-noeol.csv b/js/common/test-data/import/import-noeol.csv
new file mode 100644
index 0000000000..3db58a2846
--- /dev/null
+++ b/js/common/test-data/import/import-noeol.csv
@@ -0,0 +1,4 @@
+"value1","value2"
+a,b
+c,d
+e,f
\ No newline at end of file
diff --git a/js/server/tests/import/import-setup.js b/js/server/tests/import/import-setup.js
index 842e6e8d12..037ced3569 100644
--- a/js/server/tests/import/import-setup.js
+++ b/js/server/tests/import/import-setup.js
@@ -42,6 +42,7 @@
   db._drop("UnitTestsImportCsv3");
   db._drop("UnitTestsImportCsv4");
   db._drop("UnitTestsImportCsv5");
+  db._drop("UnitTestsImportCsvNoEol");
   db._drop("UnitTestsImportTsv1");
   db._drop("UnitTestsImportTsv2");
   db._drop("UnitTestsImportVertex");
diff --git a/js/server/tests/import/import-teardown.js b/js/server/tests/import/import-teardown.js
index 442c3ea06f..936737d637 100644
--- a/js/server/tests/import/import-teardown.js
+++ b/js/server/tests/import/import-teardown.js
@@ -42,6 +42,7 @@
   db._drop("UnitTestsImportCsv3");
   db._drop("UnitTestsImportCsv4");
   db._drop("UnitTestsImportCsv5");
+  db._drop("UnitTestsImportCsvNoEol");
   db._drop("UnitTestsImportTsv1");
   db._drop("UnitTestsImportTsv2");
   db._drop("UnitTestsImportVertex");
diff --git a/js/server/tests/import/import.js b/js/server/tests/import/import.js
index c1bf6e5420..c704b1993e 100644
--- a/js/server/tests/import/import.js
+++ b/js/server/tests/import/import.js
@@ -285,6 +285,21 @@ function importTestSuite () {
       assertEqual(expected, actual);
     },
 
+////////////////////////////////////////////////////////////////////////////////
+/// @brief test csv import without trailing eol
+////////////////////////////////////////////////////////////////////////////////
+    
+    testCsvImportNoEol : function () {
+      var expected = [ 
+        { value1: "a", value2: "b" },
+        { value1: "c", value2: "d" },
+        { value1: "e", value2: "f" }
+      ];
+
+      var actual = getQueryResults("FOR i IN UnitTestsImportCsvNoEol SORT i.value1 RETURN i");
+      assertEqual(expected, actual);
+    },
+
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief test tsv import
 ////////////////////////////////////////////////////////////////////////////////