diff --git a/test/powershell/engine/BasicEngine.Tests.ps1 b/test/powershell/engine/Api/BasicEngine.Tests.ps1
similarity index 100%
rename from test/powershell/engine/BasicEngine.Tests.ps1
rename to test/powershell/engine/Api/BasicEngine.Tests.ps1
diff --git a/test/powershell/engine/InitialSessionState.Tests.ps1 b/test/powershell/engine/Api/InitialSessionState.Tests.ps1
similarity index 96%
rename from test/powershell/engine/InitialSessionState.Tests.ps1
rename to test/powershell/engine/Api/InitialSessionState.Tests.ps1
index 608bb16f3ec..bf952ac2cae 100644
--- a/test/powershell/engine/InitialSessionState.Tests.ps1
+++ b/test/powershell/engine/Api/InitialSessionState.Tests.ps1
@@ -65,7 +65,7 @@ Describe "TypeTable duplicate types in reused runspace InitialSessionState TypeT
 
         BeforeAll {
 
-            $typeTable = [System.Management.Automation.Runspaces.TypeTable]::new([string[]](Join-Path $PSScriptRoot "../Common/TestTypeFile.ps1xml"))
+            $typeTable = [System.Management.Automation.Runspaces.TypeTable]::new([string[]](Join-Path $PSScriptRoot "assets/TestTypeFile.ps1xml"))
             [initialsessionstate] $iss = [initialsessionstate]::Create()
             $iss.Types.Add($typeTable)
             [runspace] $rs1 = [runspacefactory]::CreateRunspace($iss)
@@ -98,7 +98,7 @@ Describe "TypeTable duplicate types in reused runspace InitialSessionState TypeT
         BeforeAll {
 
             # Create default ISS and add shared TypeTable.
-            $typeTable = [System.Management.Automation.Runspaces.TypeTable]::new([string[]](Join-Path $PSScriptRoot "../Common/TestTypeFile.ps1xml"))
+            $typeTable = [System.Management.Automation.Runspaces.TypeTable]::new([string[]](Join-Path $PSScriptRoot "assets/TestTypeFile.ps1xml"))
             [initialsessionstate] $iss = [initialsessionstate]::CreateDefault2()
             $iss.Types.Add($typeTable)
             $iss.ThrowOnRunspaceOpenError = $true
diff --git a/test/powershell/Common/TestTypeFile.ps1xml b/test/powershell/engine/Api/assets/TestTypeFile.ps1xml
similarity index 100%
rename from test/powershell/Common/TestTypeFile.ps1xml
rename to test/powershell/engine/Api/assets/TestTypeFile.ps1xml
diff --git a/test/powershell/engine/Attributes.Tests.ps1 b/test/powershell/engine/Basic/Attributes.Tests.ps1
similarity index 100%
rename from test/powershell/engine/Attributes.Tests.ps1
rename to test/powershell/engine/Basic/Attributes.Tests.ps1
diff --git a/test/powershell/engine/DefaultCommands.Tests.ps1 b/test/powershell/engine/Basic/DefaultCommands.Tests.ps1
similarity index 100%
rename from test/powershell/engine/DefaultCommands.Tests.ps1
rename to test/powershell/engine/Basic/DefaultCommands.Tests.ps1
diff --git a/test/powershell/engine/PropertyAccessor.Tests.ps1 b/test/powershell/engine/Basic/PropertyAccessor.Tests.ps1
similarity index 100%
rename from test/powershell/engine/PropertyAccessor.Tests.ps1
rename to test/powershell/engine/Basic/PropertyAccessor.Tests.ps1
diff --git a/test/powershell/engine/SemanticVersion.Tests.ps1 b/test/powershell/engine/Basic/SemanticVersion.Tests.ps1
similarity index 100%
rename from test/powershell/engine/SemanticVersion.Tests.ps1
rename to test/powershell/engine/Basic/SemanticVersion.Tests.ps1
diff --git a/test/powershell/engine/ValidateAttributes.Tests.ps1 b/test/powershell/engine/Basic/ValidateAttributes.Tests.ps1
similarity index 100%
rename from test/powershell/engine/ValidateAttributes.Tests.ps1
rename to test/powershell/engine/Basic/ValidateAttributes.Tests.ps1
diff --git a/test/powershell/engine/Jobs.Tests.ps1 b/test/powershell/engine/Job/Jobs.Tests.ps1
similarity index 100%
rename from test/powershell/engine/Jobs.Tests.ps1
rename to test/powershell/engine/Job/Jobs.Tests.ps1