diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/CSharpCompletionBinding.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/CSharpCompletionBinding.cs
index c17fd5b888..69cba35ecd 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/CSharpCompletionBinding.cs
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/CSharpCompletionBinding.cs
@@ -18,6 +18,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 
 using ICSharpCode.Core;
diff --git a/src/AddIns/BackendBindings/WixBinding/Test/DirectoryImport/AddDirectoryTestFixture.cs b/src/AddIns/BackendBindings/WixBinding/Test/DirectoryImport/AddDirectoryTestFixture.cs
index 1f009ae3cf..5552fefdcb 100644
--- a/src/AddIns/BackendBindings/WixBinding/Test/DirectoryImport/AddDirectoryTestFixture.cs
+++ b/src/AddIns/BackendBindings/WixBinding/Test/DirectoryImport/AddDirectoryTestFixture.cs
@@ -16,16 +16,11 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-using ICSharpCode.SharpDevelop.Project;
+using System;
+using ICSharpCode.SharpDevelop;
 using ICSharpCode.WixBinding;
 using NUnit.Framework;
-using System;
-using System.Collections;
-using System.Collections.Specialized;
-using System.IO;
-using System.Xml;
 using WixBinding.Tests.PackageFiles;
-using WixBinding.Tests.Utils;
 
 namespace WixBinding.Tests.DirectoryImport
 {
@@ -56,6 +51,7 @@ namespace WixBinding.Tests.DirectoryImport
 		public void SetUpFixture()
 		{
 			base.InitFixture();
+			CodeCompletionOptions.DataUsageCacheEnabled = false;
 			editor.AddDirectory(directory);
 			
 			WixNamespaceManager nsManager = new WixNamespaceManager(editor.Document.NameTable);