diff --git a/src/test/java/org/elasticsearch/test/integration/AbstractSharedClusterTest.java b/src/test/java/org/elasticsearch/test/integration/AbstractSharedClusterTest.java
index ff99d12beba..8fe09c8c1b5 100644
--- a/src/test/java/org/elasticsearch/test/integration/AbstractSharedClusterTest.java
+++ b/src/test/java/org/elasticsearch/test/integration/AbstractSharedClusterTest.java
@@ -205,9 +205,9 @@ public abstract class AbstractSharedClusterTest extends ElasticsearchTestCase {
                 Object value = objects[i];
                 mappingBuilder.field(name,value);    
             }
-            mappingBuilder.endObject().endObject().endObject();
+            mappingBuilder.endObject();
         }
-        mappingBuilder.endObject();
+        mappingBuilder.endObject().endObject().endObject();
         builder.addMapping(type, mappingBuilder );
         return builder;
     }
diff --git a/src/test/java/org/elasticsearch/test/integration/abstracttests/AbstractClusterAndNodeTestTests.java b/src/test/java/org/elasticsearch/test/integration/abstracttests/AbstractClusterAndNodeTestTests.java
new file mode 100644
index 00000000000..b78e22faa58
--- /dev/null
+++ b/src/test/java/org/elasticsearch/test/integration/abstracttests/AbstractClusterAndNodeTestTests.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to ElasticSearch and Shay Banon under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. ElasticSearch licenses this
+ * file to you 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.
+ */
+
+package org.elasticsearch.test.integration.abstracttests;
+
+import org.elasticsearch.common.settings.ImmutableSettings;
+import org.elasticsearch.test.integration.AbstractSharedClusterTest;
+import org.testng.annotations.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.*;
+import com.fasterxml.jackson.core.JsonGenerationException;
+
+public class AbstractClusterAndNodeTestTests extends AbstractSharedClusterTest {
+
+
+
+    @Test
+    public void testaddMapping() throws Exception {
+        boolean exceptionThrown = false;
+        try{
+        String[] fieldNames = { "someField", "anotherField" };
+        run(addMapping(prepareCreate("test"), "type1",
+                new Object[] { fieldNames[0], "type", "string", "term_vector", "with_positions_offsets"},
+                new Object[] { fieldNames[1], "type", "string", "term_vector", "with_positions"}));
+
+        } catch (JsonGenerationException e) {
+            exceptionThrown = true;
+        }
+        assertThat(exceptionThrown, equalTo(false));
+    }
+
+}