diff --git a/js/common/tests/shell-general-graph.js b/js/common/tests/shell-general-graph.js
index a2a269801d..059bd1fbfa 100644
--- a/js/common/tests/shell-general-graph.js
+++ b/js/common/tests/shell-general-graph.js
@@ -32,6 +32,7 @@ var jsunity = require("jsunity");
 var arangodb = require("@arangodb");
 var db = arangodb.db;
 var graph = require("@arangodb/general-graph");
+var cluster = require("@arangodb/cluster");
 var ERRORS = arangodb.errors;
 
 var _ = require("underscore");
@@ -114,6 +115,10 @@ function GeneralGraphCreationSuite() {
 ////////////////////////////////////////////////////////////////////////////////
     
     test_collectionRenameEdge: function() {
+      if (! cluster.isCluster()) {
+        return;
+      }
+
       var g = graph._create(
         gN1,
         graph._edgeDefinitions(
@@ -147,6 +152,10 @@ function GeneralGraphCreationSuite() {
 ////////////////////////////////////////////////////////////////////////////////
     
     test_collectionRenameVertex: function() {
+      if (! cluster.isCluster()) {
+        return;
+      }
+
       var g = graph._create(
         gN1,
         graph._edgeDefinitions(
@@ -171,6 +180,10 @@ function GeneralGraphCreationSuite() {
 ////////////////////////////////////////////////////////////////////////////////
     
     test_collectionRenameVertices: function() {
+      if (! cluster.isCluster()) {
+        return;
+      }
+
       var g = graph._create(
         gN1,
         graph._edgeDefinitions(