diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTextgridOnlineTests.java b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTextgridOnlineTests.java
index 585331c8c95acfe7cff691451d77bdcc525bdb06..2a7ab032d8d9ab88eb4d223ad3c555e83ee3633c 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTextgridOnlineTests.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTextgridOnlineTests.java
@@ -479,7 +479,7 @@ public class OaiPmhTextgridOnlineTests {
 
     System.out.println(TESTING + "testRestokConcurrentlyListRecords()");
 
-    ExecutorService executor = Executors.newFixedThreadPool(2);
+    ExecutorService executor = Executors.newFixedThreadPool(3);
 
     Future<Boolean> f1 = executor.submit(new OaiPmhResumptionTokenTestThread(VERB_LIST_RECORDS,
         NO_SET, OAI_DC_PREFIX, 33, 100, "[B1]"));
@@ -503,50 +503,76 @@ public class OaiPmhTextgridOnlineTests {
 
     System.out.println(TESTING + "testConcurrentlyOAIDCGetRecord()");
 
-    for (int i = 0; i < 9; i++) {
-
-      System.out.println("\tThis is loop " + (i + 1));
-
-      String id1 = "textgrid:mq05.0";
-      String id2 = "textgrid:jgv6.0";
-      String id3 = "textgrid:w7rz.0";
-      String id4 = "textgrid:w36b.0";
-      String id5 = "textgrid:mcdv.0";
-      String id6 = "textgrid:v0qx.0";
-      String id7 = "textgrid:xkck.0";
-      String id8 = "textgrid:t3m1.0";
-      String id9 = "textgrid:10rsq.0";
-
-      ExecutorService executor = Executors.newFixedThreadPool(2);
-
-      if (!host.contains("dev.textgridlab.org")) {
-        Future<Boolean> f1 = executor
-            .submit(new OaiPmhGetRecordTestThread(VERB_GET_RECORD, id1, OAI_DC_PREFIX, "[GR1]"));
-        Future<Boolean> f2 = executor
-            .submit(new OaiPmhGetRecordTestThread(VERB_GET_RECORD, id2, OAI_DC_PREFIX, "[GR2]"));
-        Future<Boolean> f3 = executor
-            .submit(new OaiPmhGetRecordTestThread(VERB_GET_RECORD, id3, OAI_DC_PREFIX, "[GR3]"));
-        Future<Boolean> f4 = executor
-            .submit(new OaiPmhGetRecordTestThread(VERB_GET_RECORD, id4, OAI_DC_PREFIX, "[GR4]"));
-        Future<Boolean> f5 = executor
-            .submit(new OaiPmhGetRecordTestThread(VERB_GET_RECORD, id5, OAI_DC_PREFIX, "[GR5]"));
-        Future<Boolean> f6 = executor
-            .submit(new OaiPmhGetRecordTestThread(VERB_GET_RECORD, id6, OAI_DC_PREFIX, "[GR6]"));
-        Future<Boolean> f7 = executor
-            .submit(new OaiPmhGetRecordTestThread(VERB_GET_RECORD, id7, OAI_DC_PREFIX, "[GR7]"));
-        Future<Boolean> f8 = executor
-            .submit(new OaiPmhGetRecordTestThread(VERB_GET_RECORD, id8, OAI_DC_PREFIX, "[GR8]"));
-        Future<Boolean> f9 = executor
-            .submit(new OaiPmhGetRecordTestThread(VERB_GET_RECORD, id9, OAI_DC_PREFIX, "[GR9]"));
-
-        executor.shutdown();
-
-        System.out.println(OK + ": [GR1]=" + f1.get() + ", [GR2]=" + f2.get() + ", [GR3]="
-            + f3.get() + ", [GR4]=" + f4.get() + ", [GR5]=" + f5.get() + ", [GR6]=" + f6.get()
-            + ", [GR7]=" + f7.get() + ", [GR8]=" + f8.get() + ", [GR9]=" + f9.get());
-      } else {
-        System.out.println(NOT_TESTED);
-      }
+    String id1 = "textgrid:mq05.0";
+    String id2 = "textgrid:jgv6.0";
+    String id3 = "textgrid:w7rz.0";
+    String id4 = "textgrid:w36b.0";
+    String id5 = "textgrid:mcdv.0";
+    String id6 = "textgrid:v0qx.0";
+    String id7 = "textgrid:xkck.0";
+    String id8 = "textgrid:t3m1.0";
+    String id9 = "textgrid:10rsq.0";
+    String id10 = "textgrid:mq05.0";
+    String id11 = "textgrid:jgv6.0";
+    String id12 = "textgrid:w7rz.0";
+    String id13 = "textgrid:w36b.0";
+    String id14 = "textgrid:mcdv.0";
+    String id15 = "textgrid:v0qx.0";
+    String id16 = "textgrid:xkck.0";
+    String id17 = "textgrid:t3m1.0";
+    String id18 = "textgrid:10rsq.0";
+
+    if (!host.contains("dev.textgridlab.org")) {
+
+      ExecutorService executor = Executors.newFixedThreadPool(18);
+
+      Future<Boolean> f1 = executor
+          .submit(new OaiPmhGetRecordTestThread(VERB_GET_RECORD, id1, OAI_DC_PREFIX, "[GR1]"));
+      Future<Boolean> f2 = executor
+          .submit(new OaiPmhGetRecordTestThread(VERB_GET_RECORD, id2, OAI_DC_PREFIX, "[GR2]"));
+      Future<Boolean> f3 = executor
+          .submit(new OaiPmhGetRecordTestThread(VERB_GET_RECORD, id3, OAI_DC_PREFIX, "[GR3]"));
+      Future<Boolean> f4 = executor
+          .submit(new OaiPmhGetRecordTestThread(VERB_GET_RECORD, id4, OAI_DC_PREFIX, "[GR4]"));
+      Future<Boolean> f5 = executor
+          .submit(new OaiPmhGetRecordTestThread(VERB_GET_RECORD, id5, OAI_DC_PREFIX, "[GR5]"));
+      Future<Boolean> f6 = executor
+          .submit(new OaiPmhGetRecordTestThread(VERB_GET_RECORD, id6, OAI_DC_PREFIX, "[GR6]"));
+      Future<Boolean> f7 = executor
+          .submit(new OaiPmhGetRecordTestThread(VERB_GET_RECORD, id7, OAI_DC_PREFIX, "[GR7]"));
+      Future<Boolean> f8 = executor
+          .submit(new OaiPmhGetRecordTestThread(VERB_GET_RECORD, id8, OAI_DC_PREFIX, "[GR8]"));
+      Future<Boolean> f9 = executor
+          .submit(new OaiPmhGetRecordTestThread(VERB_GET_RECORD, id9, OAI_DC_PREFIX, "[GR9]"));
+      Future<Boolean> f10 = executor
+          .submit(new OaiPmhGetRecordTestThread(VERB_GET_RECORD, id10, OAI_DC_PREFIX, "[GR10]"));
+      Future<Boolean> f11 = executor
+          .submit(new OaiPmhGetRecordTestThread(VERB_GET_RECORD, id11, OAI_DC_PREFIX, "[GR11]"));
+      Future<Boolean> f12 = executor
+          .submit(new OaiPmhGetRecordTestThread(VERB_GET_RECORD, id12, OAI_DC_PREFIX, "[GR12]"));
+      Future<Boolean> f13 = executor
+          .submit(new OaiPmhGetRecordTestThread(VERB_GET_RECORD, id13, OAI_DC_PREFIX, "[GR13]"));
+      Future<Boolean> f14 = executor
+          .submit(new OaiPmhGetRecordTestThread(VERB_GET_RECORD, id14, OAI_DC_PREFIX, "[GR14]"));
+      Future<Boolean> f15 = executor
+          .submit(new OaiPmhGetRecordTestThread(VERB_GET_RECORD, id15, OAI_DC_PREFIX, "[GR15]"));
+      Future<Boolean> f16 = executor
+          .submit(new OaiPmhGetRecordTestThread(VERB_GET_RECORD, id16, OAI_DC_PREFIX, "[GR16]"));
+      Future<Boolean> f17 = executor
+          .submit(new OaiPmhGetRecordTestThread(VERB_GET_RECORD, id17, OAI_DC_PREFIX, "[GR17]"));
+      Future<Boolean> f18 = executor
+          .submit(new OaiPmhGetRecordTestThread(VERB_GET_RECORD, id18, OAI_DC_PREFIX, "[GR18]"));
+
+      executor.shutdown();
+
+      System.out.println(OK + "[GR1]=" + f1.get() + ", [GR2]=" + f2.get() + ", [GR3]=" + f3.get()
+          + ", [GR4]=" + f4.get() + ", [GR5]=" + f5.get() + ", [GR6]=" + f6.get() + ", [GR7]="
+          + f7.get() + ", [GR8]=" + f8.get() + ", [GR9]=" + f9.get() + ", [GR10]=" + f10.get()
+          + ", [GR11]=" + f11.get() + ", [GR12]=" + f12.get() + ", [GR13]=" + f13.get()
+          + ", [GR14]=" + f14.get() + ", [GR15]=" + f15.get() + ", [GR16]=" + f16.get()
+          + ", [GR17]=" + f17.get() + ", [GR18]=" + f18.get());
+    } else {
+      System.out.println(NOT_TESTED);
     }
   }