diff --git a/src/Tests/Program.cs b/src/Tests/Program.cs
index b6bed62f9cf..e36eed0e03f 100644
--- a/src/Tests/Program.cs
+++ b/src/Tests/Program.cs
@@ -56,7 +56,10 @@ static Program()
private static string SdkPath { get; }
private static string OutputPath { get; }
- public static void Main(string[] args)
+ // TODO: Renamed this from Main to TestMain because of a bug with Resharper and running unit tests
+ // in Visual Studio with .NET Core: https://youtrack.jetbrains.com/issue/RSRP-464233
+ // Once this is fixed, look at renaming back and removing additional packages. See https://github.com/elastic/elasticsearch-net/pull/2793
+ public static void TestMain(string[] args)
{
if (args.Length == 0)
Console.WriteLine("Must specify at least one argument: TestAssemblyPath, Profile or Benchmark ");
diff --git a/src/Tests/Tests.csproj b/src/Tests/Tests.csproj
index 47ee8d0a4ca..29000d23031 100644
--- a/src/Tests/Tests.csproj
+++ b/src/Tests/Tests.csproj
@@ -23,6 +23,7 @@
+
@@ -30,7 +31,9 @@
-
+
+
+