diff --git a/dotnet/test/DotNetCoreUnitTest/Submit/SubmitTest.cs b/dotnet/test/DotNetCoreUnitTest/Submit/SubmitTest.cs
index 546dc43d7..14a81b3c2 100644
--- a/dotnet/test/DotNetCoreUnitTest/Submit/SubmitTest.cs
+++ b/dotnet/test/DotNetCoreUnitTest/Submit/SubmitTest.cs
@@ -1,13 +1,10 @@
 using System;
-using System.Collections.Generic;
+using System.Collections.Concurrent;
 using System.Threading;
 using GeneXus.Application;
 using GeneXus.Procedure;
 using GeneXus.Utils;
-using Lucene.Net.Support;
 using Xunit;
-using System.Collections.Concurrent;
-
 
 namespace UnitTesting
 {
@@ -43,6 +40,7 @@ void executePrivate()
 				proc.executeSubmit();
 			}
 			cleanup();
+			ThreadUtil.WaitForEnd();//Force WaitForEnd since tests run in web context when running in parallel with Middleware tests
 			Assert.Equal(THREAD_NUMBER, SubmitTest.numbers.Count);
 		}
 		public override void cleanup()