--- a/make/RunTests.gmk	Mon Nov 27 19:11:45 2017 +0100
+++ b/make/RunTests.gmk	Mon Nov 27 19:13:20 2017 +0100
@@ -368,11 +368,6 @@
     $$(eval $$(call SetJtregValue,$1,JTREG_JOBS,$$(JOBS)))
   endif
 
-  ifeq ($$(shell $$(EXPR) $$($1_JTREG_JOBS) \> 50), 1)
-    # Until CODETOOLS-7901892 is fixed, JTreg cannot handle more than 50 jobs
-    $1_JTREG_JOBS := 50
-  endif
-
   # Make sure MaxRAMPercentage is high enough to not cause OOM or swapping since
   # we may end up with a lot of JVM's
   $1_JTREG_MAX_RAM_PERCENTAGE := $$(shell $$(EXPR) 25 / $$($1_JTREG_JOBS))

--- a/test/Makefile	Mon Nov 27 19:11:45 2017 +0100
+++ b/test/Makefile	Mon Nov 27 19:13:20 2017 +0100
@@ -48,12 +48,7 @@
 all: jdk_all langtools_all jaxp_all
 
 ifeq ($(TEST_JOBS), 0)
-  ifeq ($(shell $(EXPR) $(JOBS) \> 50), 1)
-    # JTReg cannot handle more than 50 in concurrency
-    JDK_TEST_JOBS=50
-  else
-    JDK_TEST_JOBS=$(JOBS)
-  endif
+  JDK_TEST_JOBS=$(JOBS)
 else
   JDK_TEST_JOBS=$(TEST_JOBS)
 endif