diff --git a/test/powershell/Language/Classes/Scripting.Classes.BasicParsing.Tests.ps1 b/test/powershell/Language/Classes/Scripting.Classes.BasicParsing.Tests.ps1
index cd016e3d76..796e360e0d 100644
--- a/test/powershell/Language/Classes/Scripting.Classes.BasicParsing.Tests.ps1
+++ b/test/powershell/Language/Classes/Scripting.Classes.BasicParsing.Tests.ps1
@@ -649,7 +649,7 @@ function test-it([EE]$ee){$ee}
         }
     }
 
-Describe 'Type building' -Tags "DRT" {
+Describe 'Type building' -Tags "CI" {
     It 'should build the type only once for scriptblock' {
         $a = $null
         1..10 | % {
@@ -671,7 +671,7 @@ Describe 'Type building' -Tags "DRT" {
     }
 }
 
-Describe 'RuntimeType created for TypeDefinitionAst' {
+Describe 'RuntimeType created for TypeDefinitionAst' -Tags "CI" {
     
     It 'can make cast to the right RuntimeType in two different contexts' -pending {
         
@@ -707,7 +707,7 @@ class Derived : Base
     }
 }
 
-Describe 'TypeTable lookups' {
+Describe 'TypeTable lookups' -Tags "CI" {
     
     Context 'Call methods from a different thread' {
         $b = [powershell]::Create().AddScript(
@@ -733,7 +733,7 @@ class B
     }
 }
 
-Describe 'Protected method access' {
+Describe 'Protected method access' -Tags "CI" {
 
     Add-Type @'
 namespace Foo
@@ -816,7 +816,7 @@ return [A]::new()
     }
 }
 
-Describe 'variable analysis' {
+Describe 'variable analysis' -Tags "CI" {
     It 'can specify type construct on the local variables' {
         class A { [string] getFoo() { return 'foo'} }
 
diff --git a/test/powershell/Language/Classes/Scripting.Classes.Exceptions.Tests.ps1 b/test/powershell/Language/Classes/Scripting.Classes.Exceptions.Tests.ps1
index d79f74a641..ca9c20db68 100644
--- a/test/powershell/Language/Classes/Scripting.Classes.Exceptions.Tests.ps1
+++ b/test/powershell/Language/Classes/Scripting.Classes.Exceptions.Tests.ps1
@@ -270,7 +270,7 @@ Describe "Exception error position" -Tags "CI" {
     }
 }
 
-Describe "Exception from initializer" -Tags "DRT" {
+Describe "Exception from initializer" -Tags "CI" {
     class MSFT_6397334a
     {
         [int]$a = "zz"
diff --git a/test/powershell/Language/Classes/scripting.Classes.inheritance.tests.ps1 b/test/powershell/Language/Classes/scripting.Classes.inheritance.tests.ps1
index a2aedb73a4..2b4f153ac7 100644
--- a/test/powershell/Language/Classes/scripting.Classes.inheritance.tests.ps1
+++ b/test/powershell/Language/Classes/scripting.Classes.inheritance.tests.ps1
@@ -81,7 +81,7 @@ Describe 'Classes inheritance syntax' -Tags "CI" {
     }
 }
 
-Describe 'Classes inheritance syntax errors' -Tags "DRT" { 
+Describe 'Classes inheritance syntax errors' -Tags "CI" {
     ShouldBeParseError "class A : NonExistingClass {}" TypeNotFound 10
     ShouldBeParseError "class A : {}" TypeNameExpected 9
     ShouldBeParseError "class A {}; class B : A, {}" TypeNameExpected 24
@@ -118,7 +118,7 @@ Describe 'Classes inheritance syntax errors' -Tags "DRT" {
     ShouldBeParseError "class A : C {}; class B : A {}; class C : B {}" TypeNotFound 10 -SkipAndCheckRuntimeError
 }
 
-Describe 'Classes methods with inheritance' -Tags "DRT" {
+Describe 'Classes methods with inheritance' -Tags "CI" {
 
     Context 'Method calls' {
 
@@ -367,7 +367,7 @@ Describe 'Classes methods with inheritance' -Tags "DRT" {
 }
 
 
-Describe 'Classes inheritance ctors syntax errors' -Tags "DRT" {
+Describe 'Classes inheritance ctors syntax errors' -Tags "CI" {
     
     #DotNet.Interface.NotImplemented
     ShouldBeParseError "class MyComparable : system.IComparable {}" TypeCreationError 0 -SkipAndCheckRuntimeError
@@ -382,7 +382,7 @@ Describe 'Classes inheritance ctors syntax errors' -Tags "DRT" {
     ShouldBeParseError 'class A { A([int]$a) {} }; class B : A {}' BaseClassNoDefaultCtor 27 -SkipAndCheckRuntimeError
 }
 
-Describe 'Classes inheritance ctors' -Tags "DRT" {
+Describe 'Classes inheritance ctors' -Tags "CI" {
     
     It 'can call base ctor' {
         class A { 
@@ -508,7 +508,7 @@ Describe 'Classes inheritance ctors' -Tags "DRT" {
     }
 }
 
-Describe 'Type creation' {
+Describe 'Type creation' -Tags "CI" {
     It 'can call super-class methods sequentially' {
         $sb = [scriptblock]::Create(@'
 class Base
diff --git a/test/powershell/Language/Classes/scripting.enums.tests.ps1 b/test/powershell/Language/Classes/scripting.enums.tests.ps1
index 05a7430ae4..fbca0604c0 100644
--- a/test/powershell/Language/Classes/scripting.enums.tests.ps1
+++ b/test/powershell/Language/Classes/scripting.enums.tests.ps1
@@ -73,7 +73,7 @@ Describe 'enums' -Tags "CI" {
     }
 }
 
-Describe 'Basic enum errors' -Tags "DRT" {
+Describe 'Basic enum errors' -Tags "CI" {
 
     Import-Module $PSScriptRoot\..\LanguageTestSupport.psm1
 
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertFrom-Json.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertFrom-Json.Tests.ps1
index 27b440cc3e..a81eced056 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertFrom-Json.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertFrom-Json.Tests.ps1
@@ -1,4 +1,4 @@
-Describe 'ConvertFrom-Json' {
+Describe 'ConvertFrom-Json' -tags "CI" {
     It 'can convert a single-line object' {
         ('{"a" : "1"}' | ConvertFrom-Json).a | Should Be 1
     }
diff --git a/test/powershell/Modules/PackageManagement/Get-Package.Tests.ps1 b/test/powershell/Modules/PackageManagement/Get-Package.Tests.ps1
index 371338a593..7ca20d4431 100644
--- a/test/powershell/Modules/PackageManagement/Get-Package.Tests.ps1
+++ b/test/powershell/Modules/PackageManagement/Get-Package.Tests.ps1
@@ -25,7 +25,7 @@ Describe "Get-package" -Tags "Feature" {
     }
 }
 
-Describe "Get-package with version parameter  - valid scenarios" -Tags @('BVT', 'DRT'){
+Describe "Get-package with version parameter  - valid scenarios" -Tags "Feature" {
     $destination = Join-Path $TestDrive GetPackageTests
 
     It "Get-package supports -AllVersions parameter" -Skip {
@@ -64,7 +64,7 @@ Describe "Get-package with version parameter  - valid scenarios" -Tags @('BVT',
     }    
 }
 
-Describe "Get-package with version parameter - Error scenarios" -Tags @('BVT', 'DRT'){
+Describe "Get-package with version parameter - Error scenarios" -Tags "Feature" {
 
     It "Get-package -AllVersions -- Cannot be used with other version parameters" {
         $Error.Clear()
diff --git a/test/powershell/Modules/PackageManagement/Nuget.Tests.ps1 b/test/powershell/Modules/PackageManagement/Nuget.Tests.ps1
index 4223781ed9..5c7caa81e2 100644
--- a/test/powershell/Modules/PackageManagement/Nuget.Tests.ps1
+++ b/test/powershell/Modules/PackageManagement/Nuget.Tests.ps1
@@ -774,7 +774,7 @@ Describe "save-package with Whatif" -Tags "Feature" {
 }
 
 
-Describe "install-package with Whatif" -Tags @('BVT', 'DRT'){
+Describe "install-package with Whatif" -Tags "Feature" {
     # make sure that packagemanagement is loaded
     #import-packagemanagement
     $installationPath = Join-Path $TestDrive "InstallationPath"
@@ -817,7 +817,7 @@ Describe "install-package with Whatif" -Tags @('BVT', 'DRT'){
     }
 }
 
-Describe "install-package with Scope" -Tags @('BVT', 'DRT'){
+Describe "install-package with Scope" -tags "Feature" {
 
      it "EXPECTED Success: Get and Install-Package without Scope without destination" {