diff --git a/core/src/test/java/org/elasticsearch/index/query/SpanContainingQueryBuilderTest.java b/core/src/test/java/org/elasticsearch/index/query/SpanContainingQueryBuilderTest.java
index cd3461b2b78..3d5f377def9 100644
--- a/core/src/test/java/org/elasticsearch/index/query/SpanContainingQueryBuilderTest.java
+++ b/core/src/test/java/org/elasticsearch/index/query/SpanContainingQueryBuilderTest.java
@@ -37,11 +37,8 @@ public class SpanContainingQueryBuilderTest extends BaseQueryTestCase<SpanContai
 
     @Override
     protected SpanContainingQueryBuilder doCreateTestQueryBuilder() {
-        SpanTermQueryBuilder bigQuery = new SpanTermQueryBuilderTest().createTestQueryBuilder();
-        // we need same field name and value type as bigQuery for little query
-        String fieldName = bigQuery.fieldName();
-        SpanTermQueryBuilder littleQuery = new SpanTermQueryBuilder(fieldName, randomValueForField(fieldName));
-        return new SpanContainingQueryBuilder(bigQuery, littleQuery);
+        SpanTermQueryBuilder[] spanTermQueries = new SpanTermQueryBuilderTest().createSpanTermQueryBuilders(2);
+        return new SpanContainingQueryBuilder(spanTermQueries[0], spanTermQueries[1]);
     }
 
     @Test
diff --git a/core/src/test/java/org/elasticsearch/index/query/SpanFirstQueryBuilderTest.java b/core/src/test/java/org/elasticsearch/index/query/SpanFirstQueryBuilderTest.java
index d3a97eb5e23..2912ed145f3 100644
--- a/core/src/test/java/org/elasticsearch/index/query/SpanFirstQueryBuilderTest.java
+++ b/core/src/test/java/org/elasticsearch/index/query/SpanFirstQueryBuilderTest.java
@@ -36,8 +36,8 @@ public class SpanFirstQueryBuilderTest extends BaseQueryTestCase<SpanFirstQueryB
 
     @Override
     protected SpanFirstQueryBuilder doCreateTestQueryBuilder() {
-        SpanTermQueryBuilder innerQueryBuilder = new SpanTermQueryBuilderTest().createTestQueryBuilder();
-        return new SpanFirstQueryBuilder(innerQueryBuilder, randomIntBetween(0, 1000));
+        SpanTermQueryBuilder[] spanTermQueries = new SpanTermQueryBuilderTest().createSpanTermQueryBuilders(1);
+        return new SpanFirstQueryBuilder(spanTermQueries[0], randomIntBetween(0, 1000));
     }
 
     @Test
diff --git a/core/src/test/java/org/elasticsearch/index/query/SpanNearQueryBuilderTest.java b/core/src/test/java/org/elasticsearch/index/query/SpanNearQueryBuilderTest.java
index c0a21062c6d..9761c27a849 100644
--- a/core/src/test/java/org/elasticsearch/index/query/SpanNearQueryBuilderTest.java
+++ b/core/src/test/java/org/elasticsearch/index/query/SpanNearQueryBuilderTest.java
@@ -45,12 +45,9 @@ public class SpanNearQueryBuilderTest extends BaseQueryTestCase<SpanNearQueryBui
     @Override
     protected SpanNearQueryBuilder doCreateTestQueryBuilder() {
         SpanNearQueryBuilder queryBuilder = new SpanNearQueryBuilder(randomIntBetween(-10, 10));
-        int clauses = randomIntBetween(1, 6);
-        // we use one random SpanTermQueryBuilder to determine same field name for subsequent clauses
-        String fieldName = new SpanTermQueryBuilderTest().createTestQueryBuilder().fieldName();
-        for (int i = 0; i < clauses; i++) {
-            // we need same field name in all clauses, so we only randomize value
-            queryBuilder.clause(new SpanTermQueryBuilder(fieldName, randomValueForField(fieldName)));
+        SpanTermQueryBuilder[] spanTermQueries = new SpanTermQueryBuilderTest().createSpanTermQueryBuilders(randomIntBetween(1, 6));
+        for (SpanTermQueryBuilder clause : spanTermQueries) {
+            queryBuilder.clause(clause);
         }
         queryBuilder.inOrder(randomBoolean());
         queryBuilder.collectPayloads(randomBoolean());
diff --git a/core/src/test/java/org/elasticsearch/index/query/SpanNotQueryBuilderTest.java b/core/src/test/java/org/elasticsearch/index/query/SpanNotQueryBuilderTest.java
index 6fe941b183b..31c07ac2773 100644
--- a/core/src/test/java/org/elasticsearch/index/query/SpanNotQueryBuilderTest.java
+++ b/core/src/test/java/org/elasticsearch/index/query/SpanNotQueryBuilderTest.java
@@ -45,19 +45,8 @@ public class SpanNotQueryBuilderTest extends BaseQueryTestCase<SpanNotQueryBuild
 
     @Override
     protected SpanNotQueryBuilder doCreateTestQueryBuilder() {
-        SpanTermQueryBuilder includeQuery = new SpanTermQueryBuilderTest().createTestQueryBuilder();
-        // we need same field name and value type as bigQuery for little query
-        String fieldName = includeQuery.fieldName();
-        Object value;
-        switch (fieldName) {
-            case BOOLEAN_FIELD_NAME: value = randomBoolean(); break;
-            case INT_FIELD_NAME: value = randomInt(); break;
-            case DOUBLE_FIELD_NAME: value = randomDouble(); break;
-            case STRING_FIELD_NAME: value = randomAsciiOfLengthBetween(1, 10); break;
-            default : value = randomAsciiOfLengthBetween(1, 10);
-        }
-        SpanTermQueryBuilder excludeQuery = new SpanTermQueryBuilder(fieldName, value);
-        SpanNotQueryBuilder queryBuilder = new SpanNotQueryBuilder(includeQuery, excludeQuery);
+        SpanTermQueryBuilder[] spanTermQueries = new SpanTermQueryBuilderTest().createSpanTermQueryBuilders(2);
+        SpanNotQueryBuilder queryBuilder = new SpanNotQueryBuilder(spanTermQueries[0], spanTermQueries[1]);
         if (randomBoolean()) {
             // also test negative values, they should implicitly be changed to 0
             queryBuilder.dist(randomIntBetween(-2, 10));
diff --git a/core/src/test/java/org/elasticsearch/index/query/SpanOrQueryBuilderTest.java b/core/src/test/java/org/elasticsearch/index/query/SpanOrQueryBuilderTest.java
index bba1373f348..59c88680dbb 100644
--- a/core/src/test/java/org/elasticsearch/index/query/SpanOrQueryBuilderTest.java
+++ b/core/src/test/java/org/elasticsearch/index/query/SpanOrQueryBuilderTest.java
@@ -44,12 +44,9 @@ public class SpanOrQueryBuilderTest extends BaseQueryTestCase<SpanOrQueryBuilder
     @Override
     protected SpanOrQueryBuilder doCreateTestQueryBuilder() {
         SpanOrQueryBuilder queryBuilder = new SpanOrQueryBuilder();
-        int clauses = randomIntBetween(1, 6);
-        // we use one random SpanTermQueryBuilder to determine same field name for subsequent clauses
-        String fieldName = new SpanTermQueryBuilderTest().createTestQueryBuilder().fieldName();
-        for (int i = 0; i < clauses; i++) {
-            // we need same field name in all clauses, so we only randomize value
-            queryBuilder.clause(new SpanTermQueryBuilder(fieldName, randomValueForField(fieldName)));
+        SpanTermQueryBuilder[] spanTermQueries = new SpanTermQueryBuilderTest().createSpanTermQueryBuilders(randomIntBetween(1, 6));
+        for (SpanTermQueryBuilder clause : spanTermQueries) {
+            queryBuilder.clause(clause);
         }
         return queryBuilder;
     }
diff --git a/core/src/test/java/org/elasticsearch/index/query/SpanTermQueryBuilderTest.java b/core/src/test/java/org/elasticsearch/index/query/SpanTermQueryBuilderTest.java
index 60bd90bbc71..e487a3532ba 100644
--- a/core/src/test/java/org/elasticsearch/index/query/SpanTermQueryBuilderTest.java
+++ b/core/src/test/java/org/elasticsearch/index/query/SpanTermQueryBuilderTest.java
@@ -34,4 +34,26 @@ public class SpanTermQueryBuilderTest extends BaseTermQueryTestCase<SpanTermQuer
     protected Query createLuceneTermQuery(Term term) {
         return new SpanTermQuery(term);
     }
+
+    /**
+     * @param amount the number of clauses that will be returned
+     * @return an array of random {@link SpanTermQueryBuilder} with same field name
+     */
+    public SpanTermQueryBuilder[] createSpanTermQueryBuilders(int amount) {
+        SpanTermQueryBuilder[] clauses = new SpanTermQueryBuilder[amount];
+        SpanTermQueryBuilder first = createTestQueryBuilder();
+        clauses[0] = first;
+        for (int i = 1; i < amount; i++) {
+            // we need same field name in all clauses, so we only randomize value
+            SpanTermQueryBuilder spanTermQuery = new SpanTermQueryBuilder(first.fieldName(), randomValueForField(first.fieldName()));
+            if (randomBoolean()) {
+                spanTermQuery.boost(2.0f / randomIntBetween(1, 20));
+            }
+            if (randomBoolean()) {
+                spanTermQuery.queryName(randomAsciiOfLengthBetween(1, 10));
+            }
+            clauses[i] = spanTermQuery;
+        }
+        return clauses;
+    }
 }
diff --git a/core/src/test/java/org/elasticsearch/index/query/SpanWithinQueryBuilderTest.java b/core/src/test/java/org/elasticsearch/index/query/SpanWithinQueryBuilderTest.java
index ee768e9c767..6f82e3e8719 100644
--- a/core/src/test/java/org/elasticsearch/index/query/SpanWithinQueryBuilderTest.java
+++ b/core/src/test/java/org/elasticsearch/index/query/SpanWithinQueryBuilderTest.java
@@ -37,19 +37,8 @@ public class SpanWithinQueryBuilderTest extends BaseQueryTestCase<SpanWithinQuer
 
     @Override
     protected SpanWithinQueryBuilder doCreateTestQueryBuilder() {
-        SpanTermQueryBuilder bigQuery = new SpanTermQueryBuilderTest().createTestQueryBuilder();
-        // we need same field name and value type as bigQuery for little query
-        String fieldName = bigQuery.fieldName();
-        Object littleValue;
-        switch (fieldName) {
-            case BOOLEAN_FIELD_NAME: littleValue = randomBoolean(); break;
-            case INT_FIELD_NAME: littleValue = randomInt(); break;
-            case DOUBLE_FIELD_NAME: littleValue = randomDouble(); break;
-            case STRING_FIELD_NAME: littleValue = randomAsciiOfLengthBetween(1, 10); break;
-            default : littleValue = randomAsciiOfLengthBetween(1, 10);
-        }
-        SpanTermQueryBuilder littleQuery = new SpanTermQueryBuilder(fieldName, littleValue);
-        return new SpanWithinQueryBuilder(bigQuery, littleQuery);
+        SpanTermQueryBuilder[] spanTermQueries = new SpanTermQueryBuilderTest().createSpanTermQueryBuilders(2);
+        return new SpanWithinQueryBuilder(spanTermQueries[0], spanTermQueries[1]);
     }
 
     @Test