diff --git a/src/EditorFeatures/CSharpTest/CSharpEditorServicesTest.csproj b/src/EditorFeatures/CSharpTest/CSharpEditorServicesTest.csproj
index 031328a063af5..8c32d4ce8aa82 100644
--- a/src/EditorFeatures/CSharpTest/CSharpEditorServicesTest.csproj
+++ b/src/EditorFeatures/CSharpTest/CSharpEditorServicesTest.csproj
@@ -224,6 +224,7 @@
     <Compile Include="Diagnostics\Async\AddAwaitTests.cs" />
     <Compile Include="Diagnostics\Async\ChangeToAsyncTests.cs" />
     <Compile Include="Diagnostics\DiagnosticAnalyzerDriver\DiagnosticAnalyzerDriverTests.cs" />
+    <Compile Include="Diagnostics\FixAllProvider\BatchFixerTests.cs" />
     <Compile Include="Diagnostics\FullyQualify\FullyQualifyTests.cs" />
     <Compile Include="Diagnostics\GenerateConstructor\GenerateConstructorTests.cs" />
     <Compile Include="Diagnostics\GenerateEnumMember\GenerateEnumMemberTests.cs" />
@@ -614,10 +615,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="CodeActions\AddUsing\" />
-    <Folder Include="CodeActions\RemoveUnnecessaryCast\" />
-  </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
diff --git a/src/EditorFeatures/CSharpTest/Diagnostics/FixAllProvider/BatchFixerTests.cs b/src/EditorFeatures/CSharpTest/Diagnostics/FixAllProvider/BatchFixerTests.cs
new file mode 100644
index 0000000000000..0ad40aa333f6e
--- /dev/null
+++ b/src/EditorFeatures/CSharpTest/Diagnostics/FixAllProvider/BatchFixerTests.cs
@@ -0,0 +1,160 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Immutable;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Roslyn.Test.Utilities;
+using Xunit;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Diagnostics.SimplifyTypeNames
+{
+    public partial class BatchFixerTests : AbstractCSharpDiagnosticProviderBasedUserDiagnosticTest
+    {
+        internal override Tuple<DiagnosticAnalyzer, CodeFixProvider> CreateDiagnosticProviderAndFixer(Workspace workspace)
+        {
+            return Tuple.Create<DiagnosticAnalyzer, CodeFixProvider>(new QualifyWithThisAnalyzer(), new QualifyWithThisFixer());
+        }
+
+        [DiagnosticAnalyzer(LanguageNames.CSharp)]
+        private class QualifyWithThisAnalyzer : DiagnosticAnalyzer
+        {
+            public static readonly DiagnosticDescriptor Descriptor = new TriggerDiagnosticDescriptor("QualifyWithThis");
+
+            public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics
+            {
+                get
+                {
+                    return ImmutableArray.Create(Descriptor);
+                }
+            }
+
+            public override void Initialize(AnalysisContext context)
+            {
+                context.RegisterSyntaxNodeAction<SyntaxKind>(AnalyzeNode, SyntaxKind.IdentifierName);
+            }
+
+            private static void AnalyzeNode(SyntaxNodeAnalysisContext context)
+            {
+                var node = context.Node as SimpleNameSyntax;
+                if (node != null)
+                {
+                    var symbol = context.SemanticModel.GetSymbolInfo(node).Symbol;
+                    if (symbol != null && symbol.Kind == SymbolKind.Field)
+                    {
+                        var diagnostic = Diagnostic.Create(Descriptor, node.GetLocation());
+                        context.ReportDiagnostic(diagnostic);
+                    }
+                }
+            }
+        }
+
+        private class QualifyWithThisFixer : CodeFixProvider
+        {
+            public override ImmutableArray<string> FixableDiagnosticIds
+            {
+                get
+                {
+                    return ImmutableArray.Create(QualifyWithThisAnalyzer.Descriptor.Id);
+                }
+            }
+
+            public async override Task RegisterCodeFixesAsync(CodeFixContext context)
+            {
+                var root = await context.Document.GetSyntaxRootAsync(context.CancellationToken).ConfigureAwait(false);
+                var node = root.FindNode(context.Span, getInnermostNodeForTie: true) as SimpleNameSyntax;
+                if (node != null)
+                {
+                    var leadingTrivia = node.GetLeadingTrivia();
+                    var newNode = SyntaxFactory.MemberAccessExpression(
+                        SyntaxKind.SimpleMemberAccessExpression,
+                        SyntaxFactory.ThisExpression(),
+                        node.WithoutLeadingTrivia())
+                        .WithLeadingTrivia(leadingTrivia);
+
+                    var newRoot = root.ReplaceNode(node, newNode);
+                    var newDocument = context.Document.WithSyntaxRoot(newRoot);
+
+                    // Disable RS0005 as this is test code and we don't need telemtry for created code action.
+#pragma warning disable RS0005 // Do not use generic CodeAction.Create to create CodeAction
+                    var fix = CodeAction.Create("QualifyWithThisFix", _ => Task.FromResult(newDocument));
+#pragma warning restore RS0005 // Do not use generic CodeAction.Create to create CodeAction
+
+                    context.RegisterCodeFix(fix, context.Diagnostics);
+                }
+            }
+
+            public override FixAllProvider GetFixAllProvider()
+            {
+                return WellKnownFixAllProviders.BatchFixer;
+            }
+        }
+
+        #region "Fix all occurrences tests"
+
+        [Fact(Skip = "https://github.com/dotnet/roslyn/issues/320")]
+        [Trait(Traits.Feature, Traits.Features.CodeActionsFixAllOccurrences)]
+        public void TestFixAllInDocument_QualifyWithThis()
+        {
+            var input = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""Assembly1"" CommonReferences=""true"">
+        <Document>
+class C
+{
+    int Sign;
+    void F()
+    {
+        string x = @""namespace Namespace
+    {
+        class Type
+        {
+            void Foo()
+            {
+                int x = 1 "" + {|FixAllInDocument:Sign|} + @"" "" + Sign + @""3;
+            }
+        }
+    }
+"";
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+
+            var expected = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""Assembly1"" CommonReferences=""true"">
+        <Document>
+class C
+{
+    int Sign;
+    void F()
+    {
+        string x = @""namespace Namespace
+    {
+        class Type
+        {
+            void Foo()
+            {
+                int x = 1 "" + this.Sign + @"" "" + this.Sign + @""3;
+            }
+        }
+    }
+"";
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+
+            Test(input, expected, isLine: false, compareTokens: false);
+        }
+        
+        #endregion
+    }
+}