diff --git a/test/powershell/enginecore/Parser.Tests.ps1 b/test/powershell/Language/Parser/Parser.Tests.ps1
similarity index 100%
rename from test/powershell/enginecore/Parser.Tests.ps1
rename to test/powershell/Language/Parser/Parser.Tests.ps1
diff --git a/test/powershell/enginecore/TestGetCommand.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Core/TestGetCommand.Tests.ps1
similarity index 100%
rename from test/powershell/enginecore/TestGetCommand.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Core/TestGetCommand.Tests.ps1
diff --git a/test/powershell/enginecore/Eventing.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Eventing.Tests.ps1
similarity index 100%
rename from test/powershell/enginecore/Eventing.Tests.ps1
rename to test/powershell/Modules/Microsoft.PowerShell.Utility/Eventing.Tests.ps1
diff --git a/test/powershell/enginecore/ProviderIntrinsics.Tests.ps1 b/test/powershell/Provider/ProviderIntrinsics.Tests.ps1
similarity index 100%
rename from test/powershell/enginecore/ProviderIntrinsics.Tests.ps1
rename to test/powershell/Provider/ProviderIntrinsics.Tests.ps1
diff --git a/test/powershell/enginecore/LanguagePrimitive.Tests.ps1 b/test/powershell/engine/Api/LanguagePrimitive.Tests.ps1
similarity index 100%
rename from test/powershell/enginecore/LanguagePrimitive.Tests.ps1
rename to test/powershell/engine/Api/LanguagePrimitive.Tests.ps1
diff --git a/test/powershell/enginecore/Serialization.Tests.ps1 b/test/powershell/engine/Api/Serialization.Tests.ps1
similarity index 100%
rename from test/powershell/enginecore/Serialization.Tests.ps1
rename to test/powershell/engine/Api/Serialization.Tests.ps1
diff --git a/test/powershell/enginecore/CommandDiscovery.Tests.ps1 b/test/powershell/engine/Basic/CommandDiscovery.Tests.ps1
similarity index 100%
rename from test/powershell/enginecore/CommandDiscovery.Tests.ps1
rename to test/powershell/engine/Basic/CommandDiscovery.Tests.ps1
diff --git a/test/powershell/enginecore/Adapter.Tests.ps1 b/test/powershell/engine/ETS/Adapter.Tests.ps1
similarity index 100%
rename from test/powershell/enginecore/Adapter.Tests.ps1
rename to test/powershell/engine/ETS/Adapter.Tests.ps1
diff --git a/test/powershell/enginecore/ModulePath.Tests.ps1 b/test/powershell/engine/Module/ModulePath.Tests.ps1
similarity index 100%
rename from test/powershell/enginecore/ModulePath.Tests.ps1
rename to test/powershell/engine/Module/ModulePath.Tests.ps1
diff --git a/test/powershell/enginecore/BooleanParameterDCR.Tests.ps1 b/test/powershell/engine/ParameterBinding/BooleanParameterDCR.Tests.ps1
similarity index 100%
rename from test/powershell/enginecore/BooleanParameterDCR.Tests.ps1
rename to test/powershell/engine/ParameterBinding/BooleanParameterDCR.Tests.ps1
diff --git a/test/powershell/enginecore/NullableBooleanDCR.Tests.ps1 b/test/powershell/engine/ParameterBinding/NullableBooleanDCR.Tests.ps1
similarity index 100%
rename from test/powershell/enginecore/NullableBooleanDCR.Tests.ps1
rename to test/powershell/engine/ParameterBinding/NullableBooleanDCR.Tests.ps1
diff --git a/test/powershell/enginecore/ParameterBinding.Tests.ps1 b/test/powershell/engine/ParameterBinding/ParameterBinding.Tests.ps1
similarity index 100%
rename from test/powershell/enginecore/ParameterBinding.Tests.ps1
rename to test/powershell/engine/ParameterBinding/ParameterBinding.Tests.ps1