diff --git a/UnitTests/Makefile.unittests b/UnitTests/Makefile.unittests
index 6450546865..fb314b906e 100755
--- a/UnitTests/Makefile.unittests
+++ b/UnitTests/Makefile.unittests
@@ -374,7 +374,8 @@ SHELL_SERVER_ONLY = \
                @top_srcdir@/js/common/tests/shell-graph-traversal.js \
                @top_srcdir@/js/common/tests/shell-graph-algorithms.js \
                @top_srcdir@/js/common/tests/shell-graph-measurement.js \
-               @top_srcdir@/js/common/tests/shell-skiplist-index.js
+               @top_srcdir@/js/common/tests/shell-skiplist-index.js \
+               @top_srcdir@/js/server/tests/shell-skiplist-rm-performance.js
 
 SHELL_SERVER = $(SHELL_COMMON) $(SHELL_SERVER_ONLY)
 
diff --git a/js/server/tests/shell-skiplist-rm-performance.js b/js/server/tests/shell-skiplist-rm-performance.js
new file mode 100644
index 0000000000..bdbc83e5e6
--- /dev/null
+++ b/js/server/tests/shell-skiplist-rm-performance.js
@@ -0,0 +1,139 @@
+/*jslint indent: 2, nomen: true, maxlen: 80 */
+/*global require, db, assertEqual, assertTrue, ArangoCollection */
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief test the performance of removal with a skip-list index
+///
+/// @file
+///
+/// DISCLAIMER
+///
+/// Copyright 2013 triagens GmbH, Cologne, Germany
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+/// Copyright holder is triAGENS GmbH, Cologne, Germany
+///
+/// @author Max Neunhoeffer
+/// @author Copyright 2013, triAGENS GmbH, Cologne, Germany
+////////////////////////////////////////////////////////////////////////////////
+
+var jsunity = require("jsunity");
+var internal = require("internal");
+var console = require("console");
+var errors = internal.errors;
+
+// -----------------------------------------------------------------------------
+// --SECTION--                                                     basic methods
+// -----------------------------------------------------------------------------
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief test suite: Creation
+////////////////////////////////////////////////////////////////////////////////
+
+function SkipListPerfSuite() {
+  var ERRORS = internal.errors;
+  var cn = "UnitTestsCollectionSkiplistPerf";
+  var collection = null;
+
+  return {
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief set up
+////////////////////////////////////////////////////////////////////////////////
+
+  setUp : function () {
+    internal.db._drop(cn);
+    collection = internal.db._create(cn, { waitForSync : false });
+  },
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief tear down
+////////////////////////////////////////////////////////////////////////////////
+
+  tearDown : function () {
+    // try...catch is necessary as some tests delete the collection itself!
+    try {
+      collection.unload();
+      collection.drop();
+    }
+    catch (err) {
+    }
+
+    collection = null;
+    internal.wait(0.0);
+  },
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief test: performance of deletion with skip-list index
+////////////////////////////////////////////////////////////////////////////////
+
+    testDeletionPerformance : function () {
+        var time = require("internal").time;
+        collection.ensureSkiplist("value"); 
+        var N=100000;
+        var p=14777;  // must be coprime to N
+        for (i = 0;i < N;i++) { 
+            collection.save({value:i}); 
+        }; 
+        var l = collection.toArray();
+        var t = time();
+        var j = 0;
+        var x;
+        for (var i = 0;i < l.length;i++) { 
+            x = l[j];
+            j = (j+p) % l.length;
+            collection.remove(x._key)
+        }; 
+        var t1 = time()-t;
+        internal.db._drop(cn); 
+        collection = internal.db._create(cn); 
+        collection.ensureSkiplist("value"); 
+        for (i = 0;i < N;i++) { 
+            collection.save({value: i % 10}); 
+        }; 
+        l = collection.toArray();
+        t = time();
+        j = 0;
+        for (i = 0;i < l.length;i++) { 
+            x = l[j];
+            j = (j+p) % l.length;
+            collection.remove(x._key)
+        }; 
+        t2 = time()-t;
+        assertFalse(t2 > 5*t1,"Removal with skip-list index is slow");
+    }
+
+  };
+}
+
+// -----------------------------------------------------------------------------
+// --SECTION--                                                              main
+// -----------------------------------------------------------------------------
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief executes the test suites
+////////////////////////////////////////////////////////////////////////////////
+
+jsunity.run(SkipListPerfSuite);
+
+return jsunity.done();
+
+// -----------------------------------------------------------------------------
+// --SECTION--                                                       END-OF-FILE
+// -----------------------------------------------------------------------------
+
+// Local Variables:
+// mode: outline-minor
+// outline-regexp: "/// @brief\\|/// @addtogroup\\|// --SECTION--\\|/// @page\\|/// @}"
+// End: