diff --git a/test/E2ETest/TyeBuildTests.Dockerfile.cs b/test/E2ETest/TyeBuildTests.Dockerfile.cs
index 02c2a167..e7a39f38 100644
--- a/test/E2ETest/TyeBuildTests.Dockerfile.cs
+++ b/test/E2ETest/TyeBuildTests.Dockerfile.cs
@@ -6,9 +6,9 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Tye;
-using Test.Infrastucture;
+using Test.Infrastructure;
 using Xunit;
-using static Test.Infrastucture.TestHelpers;
+using static Test.Infrastructure.TestHelpers;
 
 namespace E2ETest
 {
diff --git a/test/E2ETest/TyeBuildTests.cs b/test/E2ETest/TyeBuildTests.cs
index 01a9c9d8..c817fa03 100644
--- a/test/E2ETest/TyeBuildTests.cs
+++ b/test/E2ETest/TyeBuildTests.cs
@@ -5,9 +5,9 @@
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.Tye;
-using Test.Infrastucture;
+using Test.Infrastructure;
 using Xunit.Abstractions;
-using static Test.Infrastucture.TestHelpers;
+using static Test.Infrastructure.TestHelpers;
 
 namespace E2ETest
 {
diff --git a/test/E2ETest/TyeGenerateTests.cs b/test/E2ETest/TyeGenerateTests.cs
index efe2c399..06eec30e 100644
--- a/test/E2ETest/TyeGenerateTests.cs
+++ b/test/E2ETest/TyeGenerateTests.cs
@@ -6,10 +6,10 @@ using System;
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.Tye;
-using Test.Infrastucture;
+using Test.Infrastructure;
 using Xunit;
 using Xunit.Abstractions;
-using static Test.Infrastucture.TestHelpers;
+using static Test.Infrastructure.TestHelpers;
 
 namespace E2ETest
 {
diff --git a/test/E2ETest/TyeInitTests.cs b/test/E2ETest/TyeInitTests.cs
index 3942156b..7b111f80 100644
--- a/test/E2ETest/TyeInitTests.cs
+++ b/test/E2ETest/TyeInitTests.cs
@@ -6,12 +6,12 @@ using System;
 using System.IO;
 using Microsoft.Tye;
 using Microsoft.Tye.ConfigModel;
-using Test.Infrastucture;
+using Test.Infrastructure;
 using Xunit;
 using Xunit.Abstractions;
 using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.NamingConventions;
-using static Test.Infrastucture.TestHelpers;
+using static Test.Infrastructure.TestHelpers;
 
 namespace E2ETest
 {
diff --git a/test/E2ETest/TyePurgeTests.cs b/test/E2ETest/TyePurgeTests.cs
index b715498e..399efdde 100644
--- a/test/E2ETest/TyePurgeTests.cs
+++ b/test/E2ETest/TyePurgeTests.cs
@@ -11,10 +11,10 @@ using System.Threading.Tasks;
 using Microsoft.Tye;
 using Microsoft.Tye.Hosting;
 using Microsoft.Tye.Hosting.Model;
-using Test.Infrastucture;
+using Test.Infrastructure;
 using Xunit;
 using Xunit.Abstractions;
-using static Test.Infrastucture.TestHelpers;
+using static Test.Infrastructure.TestHelpers;
 
 namespace E2ETest
 {
diff --git a/test/E2ETest/TyeRunTests.cs b/test/E2ETest/TyeRunTests.cs
index ac050c2d..14d1dd9e 100644
--- a/test/E2ETest/TyeRunTests.cs
+++ b/test/E2ETest/TyeRunTests.cs
@@ -15,10 +15,10 @@ using Microsoft.Tye;
 using Microsoft.Tye.Hosting;
 using Microsoft.Tye.Hosting.Model;
 using Microsoft.Tye.Hosting.Model.V1;
-using Test.Infrastucture;
+using Test.Infrastructure;
 using Xunit;
 using Xunit.Abstractions;
-using static Test.Infrastucture.TestHelpers;
+using static Test.Infrastructure.TestHelpers;
 
 namespace E2ETest
 {
diff --git a/test/Test.Infrastructure/ConditionalFactAttribute.cs b/test/Test.Infrastructure/ConditionalFactAttribute.cs
index 3245ccaa..fdd7461b 100644
--- a/test/Test.Infrastructure/ConditionalFactAttribute.cs
+++ b/test/Test.Infrastructure/ConditionalFactAttribute.cs
@@ -6,10 +6,10 @@ using System;
 using Xunit;
 using Xunit.Sdk;
 
-namespace Test.Infrastucture
+namespace Test.Infrastructure
 {
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
-    [XunitTestCaseDiscoverer("E2ETest." + nameof(ConditionalFactDiscoverer), "Microsoft.Tye.E2ETest")]
+    [XunitTestCaseDiscoverer("Test.Infrastructure." + nameof(ConditionalFactDiscoverer), "Test.Infrastructure")]
     public class ConditionalFactAttribute : FactAttribute
     {
     }
diff --git a/test/Test.Infrastructure/ConditionalFactDiscoverer.cs b/test/Test.Infrastructure/ConditionalFactDiscoverer.cs
index d62d271e..c1615293 100644
--- a/test/Test.Infrastructure/ConditionalFactDiscoverer.cs
+++ b/test/Test.Infrastructure/ConditionalFactDiscoverer.cs
@@ -6,7 +6,7 @@ using Xunit.Abstractions;
 using Xunit.Sdk;
 
 // Do not change this namespace without changing the usage in ConditionalFactAttribute
-namespace Test.Infrastucture
+namespace Test.Infrastructure
 {
     internal class ConditionalFactDiscoverer : FactDiscoverer
     {
diff --git a/test/Test.Infrastructure/ConditionalTheoryAttribute.cs b/test/Test.Infrastructure/ConditionalTheoryAttribute.cs
index fba9054f..9bbd5678 100644
--- a/test/Test.Infrastructure/ConditionalTheoryAttribute.cs
+++ b/test/Test.Infrastructure/ConditionalTheoryAttribute.cs
@@ -6,10 +6,10 @@ using System;
 using Xunit;
 using Xunit.Sdk;
 
-namespace E2ETest
+namespace Test.Infrastructure
 {
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
-    [XunitTestCaseDiscoverer("E2ETest." + nameof(ConditionalTheoryDiscoverer), "Microsoft.Tye.E2ETest")]
+    [XunitTestCaseDiscoverer("Test.Infrastructure." + nameof(ConditionalTheoryDiscoverer), "Test.Infrastructure")]
     public class ConditionalTheoryAttribute : TheoryAttribute
     {
     }
diff --git a/test/Test.Infrastructure/ConditionalTheoryDiscoverer.cs b/test/Test.Infrastructure/ConditionalTheoryDiscoverer.cs
index a3f14e8c..640e696a 100644
--- a/test/Test.Infrastructure/ConditionalTheoryDiscoverer.cs
+++ b/test/Test.Infrastructure/ConditionalTheoryDiscoverer.cs
@@ -3,11 +3,10 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Generic;
-using Test.Infrastucture;
 using Xunit.Abstractions;
 using Xunit.Sdk;
 
-namespace E2ETest
+namespace Test.Infrastructure
 {
     internal class ConditionalTheoryDiscoverer : TheoryDiscoverer
     {
diff --git a/test/Test.Infrastructure/DockerAssert.cs b/test/Test.Infrastructure/DockerAssert.cs
index e95af10f..eb80d332 100644
--- a/test/Test.Infrastructure/DockerAssert.cs
+++ b/test/Test.Infrastructure/DockerAssert.cs
@@ -11,7 +11,7 @@ using System.Threading.Tasks;
 using Xunit.Abstractions;
 using Xunit.Sdk;
 
-namespace Test.Infrastucture
+namespace Test.Infrastructure
 {
     public static class DockerAssert
     {
diff --git a/test/Test.Infrastructure/EqualityYamlNodeVisitor.cs b/test/Test.Infrastructure/EqualityYamlNodeVisitor.cs
index 02b6a1c1..1499f247 100644
--- a/test/Test.Infrastructure/EqualityYamlNodeVisitor.cs
+++ b/test/Test.Infrastructure/EqualityYamlNodeVisitor.cs
@@ -7,7 +7,7 @@ using System.CommandLine;
 using Tye.Serialization;
 using YamlDotNet.RepresentationModel;
 
-namespace E2ETest
+namespace Test.Infrastructure
 {
     public class EqualityYamlNodeVisitor
     {
diff --git a/test/Test.Infrastructure/ITestCondition.cs b/test/Test.Infrastructure/ITestCondition.cs
index aae9c054..6b34d2eb 100644
--- a/test/Test.Infrastructure/ITestCondition.cs
+++ b/test/Test.Infrastructure/ITestCondition.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace Test.Infrastucture
+namespace Test.Infrastructure
 {
     public interface ITestCondition
     {
diff --git a/test/Test.Infrastructure/RetryHandler.cs b/test/Test.Infrastructure/RetryHandler.cs
index 7c01cda6..0848cc5a 100644
--- a/test/Test.Infrastructure/RetryHandler.cs
+++ b/test/Test.Infrastructure/RetryHandler.cs
@@ -8,7 +8,7 @@ using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Test.Infrastucture
+namespace Test.Infrastructure
 {
     public class RetryHandler : DelegatingHandler
     {
diff --git a/test/Test.Infrastructure/SkipIfDockerNotRunningAttribute.cs b/test/Test.Infrastructure/SkipIfDockerNotRunningAttribute.cs
index 328abbb0..f3aad66f 100644
--- a/test/Test.Infrastructure/SkipIfDockerNotRunningAttribute.cs
+++ b/test/Test.Infrastructure/SkipIfDockerNotRunningAttribute.cs
@@ -5,7 +5,7 @@
 using System;
 using Microsoft.Tye;
 
-namespace Test.Infrastucture
+namespace Test.Infrastructure
 {
     [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class | AttributeTargets.Assembly)]
     public class SkipIfDockerNotRunningAttribute : Attribute, ITestCondition
diff --git a/test/Test.Infrastructure/SkipOnLinuxAttribute.cs b/test/Test.Infrastructure/SkipOnLinuxAttribute.cs
index df050607..a7d64ac1 100644
--- a/test/Test.Infrastructure/SkipOnLinuxAttribute.cs
+++ b/test/Test.Infrastructure/SkipOnLinuxAttribute.cs
@@ -5,7 +5,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Test.Infrastucture
+namespace Test.Infrastructure
 {
     [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class | AttributeTargets.Assembly)]
     internal class SkipOnLinuxAttribute : Attribute, ITestCondition
diff --git a/test/Test.Infrastructure/SkippedTestCase.cs b/test/Test.Infrastructure/SkippedTestCase.cs
index 6223beb3..6ae15e1a 100644
--- a/test/Test.Infrastructure/SkippedTestCase.cs
+++ b/test/Test.Infrastructure/SkippedTestCase.cs
@@ -6,7 +6,7 @@ using System;
 using Xunit.Abstractions;
 using Xunit.Sdk;
 
-namespace Test.Infrastucture
+namespace Test.Infrastructure
 {
     public class SkippedTestCase : XunitTestCase
     {
diff --git a/test/Test.Infrastructure/Test.Infrastructure.csproj b/test/Test.Infrastructure/Test.Infrastructure.csproj
index 14e61824..aa9af3f6 100644
--- a/test/Test.Infrastructure/Test.Infrastructure.csproj
+++ b/test/Test.Infrastructure/Test.Infrastructure.csproj
@@ -6,13 +6,6 @@
     <TestRunnerName>XUnit</TestRunnerName>
   </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.Tye.Hosting\Microsoft.Tye.Hosting.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.Tye.Core\Microsoft.Tye.Core.csproj" />
-    <ProjectReference Include="..\..\src\tye\tye.csproj" />
-  </ItemGroup>
-
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.Tye.Hosting\Microsoft.Tye.Hosting.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.Tye.Core\Microsoft.Tye.Core.csproj" />
diff --git a/test/Test.Infrastructure/TestHelpers.cs b/test/Test.Infrastructure/TestHelpers.cs
index b18e29b1..3a8ddf72 100644
--- a/test/Test.Infrastructure/TestHelpers.cs
+++ b/test/Test.Infrastructure/TestHelpers.cs
@@ -14,7 +14,7 @@ using Microsoft.Tye.Hosting.Model;
 using Xunit;
 using Microsoft.Tye;
 
-namespace Test.Infrastucture
+namespace Test.Infrastructure
 {
     public static class TestHelpers
     {
diff --git a/test/Test.Infrastructure/TestMethodExtensions.cs b/test/Test.Infrastructure/TestMethodExtensions.cs
index 3e66bfef..e3178fdc 100644
--- a/test/Test.Infrastructure/TestMethodExtensions.cs
+++ b/test/Test.Infrastructure/TestMethodExtensions.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using Xunit.Abstractions;
 using Xunit.Sdk;
 
-namespace Test.Infrastucture
+namespace Test.Infrastructure
 {
     public static class TestMethodExtensions
     {
diff --git a/test/Test.Infrastructure/TestOutputLogEventSink.cs b/test/Test.Infrastructure/TestOutputLogEventSink.cs
index caf9febe..4b2fd2da 100644
--- a/test/Test.Infrastructure/TestOutputLogEventSink.cs
+++ b/test/Test.Infrastructure/TestOutputLogEventSink.cs
@@ -4,7 +4,7 @@ using Serilog.Core;
 using Serilog.Events;
 using Xunit.Abstractions;
 
-namespace Test.Infrastucture
+namespace Test.Infrastructure
 {
     public class TestOutputLogEventSink : ILogEventSink, IConsole, IStandardStreamWriter
     {
diff --git a/test/Test.Infrastructure/TyeAssert.cs b/test/Test.Infrastructure/TyeAssert.cs
index fde28c84..e9ca4470 100644
--- a/test/Test.Infrastructure/TyeAssert.cs
+++ b/test/Test.Infrastructure/TyeAssert.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using Microsoft.Tye.ConfigModel;
 using Xunit;
 
-namespace Test.Infrastucture
+namespace Test.Infrastructure
 {
     public static class TyeAssert
     {
diff --git a/test/Test.Infrastructure/YamlAssert.cs b/test/Test.Infrastructure/YamlAssert.cs
index d72859a7..7b97a34a 100644
--- a/test/Test.Infrastructure/YamlAssert.cs
+++ b/test/Test.Infrastructure/YamlAssert.cs
@@ -6,7 +6,7 @@ using Xunit;
 using Xunit.Abstractions;
 using YamlDotNet.RepresentationModel;
 
-namespace E2ETest
+namespace Test.Infrastructure
 {
     public static class YamlAssert
     {
diff --git a/test/UnitTests/ApplicationFactoryTests.cs b/test/UnitTests/ApplicationFactoryTests.cs
index 15d4834b..eef19c11 100644
--- a/test/UnitTests/ApplicationFactoryTests.cs
+++ b/test/UnitTests/ApplicationFactoryTests.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Tye;
-using Test.Infrastucture;
+using Test.Infrastructure;
 using Xunit;
 using Xunit.Abstractions;
 
diff --git a/test/UnitTests/TyeDeserializationTests.cs b/test/UnitTests/TyeDeserializationTests.cs
index a78be916..8a476c16 100644
--- a/test/UnitTests/TyeDeserializationTests.cs
+++ b/test/UnitTests/TyeDeserializationTests.cs
@@ -1,7 +1,7 @@
 using System.IO;
 using System.Linq;
 using Microsoft.Tye.ConfigModel;
-using Test.Infrastucture;
+using Test.Infrastructure;
 using Tye;
 using Tye.Serialization;
 using Xunit;