diff --git a/AddIns/ICSharpCode.SharpDevelop.addin b/AddIns/ICSharpCode.SharpDevelop.addin
index c04994f441..fbe81dee39 100644
--- a/AddIns/ICSharpCode.SharpDevelop.addin
+++ b/AddIns/ICSharpCode.SharpDevelop.addin
@@ -2134,6 +2134,14 @@
 		</MenuItem>
 	</Path>
 	
+	<Path name="/SharpDevelop/Workbench/MainMenu">
+		<MenuItem id="QualityTools" label="Quality Tools" insertbefore="Tools" type="Menu">
+			<MenuItem id="Profiler" label="Profiler" type="Menu" />
+			<MenuItem id="Test" label="Test" type="Menu" />
+			<MenuItem id="Separator1" type="Separator" />
+		</MenuItem>
+	</Path>
+	
 	<Path name = "/SharpDevelop/Views/ProjectBrowser/NodeBuilders">
 		<Class id = "DefaultBuilder"
 		       class = "ICSharpCode.SharpDevelop.Project.DefaultDotNetNodeBuilder"/>
diff --git a/src/AddIns/Misc/CodeAnalysis/CodeAnalysis.addin b/src/AddIns/Misc/CodeAnalysis/CodeAnalysis.addin
index 291074dfb7..8c5718f90d 100644
--- a/src/AddIns/Misc/CodeAnalysis/CodeAnalysis.addin
+++ b/src/AddIns/Misc/CodeAnalysis/CodeAnalysis.addin
@@ -32,6 +32,17 @@
 		          class = "ICSharpCode.CodeAnalysis.CheckCurrentProjectCommand"/>
 	</Path>
 	
+	<Path name = "/SharpDevelop/Workbench/MainMenu/QualityTools">
+		<ComplexCondition action="Disable">
+			<And>
+				<Condition name = "ProjectActive" activeproject="*" />
+			</And>
+			<MenuItem id    = "CheckWithFxCop"
+			          label = "Check current project with FxCop"
+			          class = "ICSharpCode.CodeAnalysis.CheckCurrentProjectCommand"/>
+		</ComplexCondition>
+	</Path>
+	
 	<Path name = "/SharpDevelop/MSBuildEngine/AdditionalLoggers">
 		<TaskBoundAdditionalLogger
 			id = "FxCopLogger"
@@ -51,7 +62,7 @@
 	<!-- Options panel -->
 	<Path name = "/SharpDevelop/Dialogs/OptionsDialog/ToolsOptions">
 		<DialogPanel id    = "CodeAnalysisOptionPanel"
-		       	     label = "${res:ICSharpCode.CodeAnalysis}"
-		       	     class = "ICSharpCode.CodeAnalysis.AnalysisIdeOptionsPanel"/>
+		             label = "${res:ICSharpCode.CodeAnalysis}"
+		             class = "ICSharpCode.CodeAnalysis.AnalysisIdeOptionsPanel"/>
 	</Path>
 </AddIn>
diff --git a/src/AddIns/Misc/SourceAnalysis/SourceAnalysis.addin b/src/AddIns/Misc/SourceAnalysis/SourceAnalysis.addin
index 7e9b42012d..c0ebe44f29 100644
--- a/src/AddIns/Misc/SourceAnalysis/SourceAnalysis.addin
+++ b/src/AddIns/Misc/SourceAnalysis/SourceAnalysis.addin
@@ -33,10 +33,21 @@
 		          class = "MattEverson.SourceAnalysis.CheckCurrentProjectCommand"/>
 	</Path>
 	
+	<Path name="/SharpDevelop/Workbench/MainMenu/QualityTools">
+		<ComplexCondition action="Disable">
+			<And>
+				<Condition name = "ProjectActive" activeproject="*" />
+			</And>
+			<MenuItem id    = "CheckWithStyleCop"
+			          label = "Check current project with StyleCop"
+			          class = "MattEverson.SourceAnalysis.CheckCurrentProjectCommand"/>
+		</ComplexCondition>
+	</Path>
+	
 	<!-- Options panel -->
 	<Path name = "/SharpDevelop/Dialogs/OptionsDialog/ToolsOptions">
 		<DialogPanel id    = "SourceAnalysisOptionPanel"
-		       	     label = "${res:AddIns.SourceAnalysis.Title}"
-		       	     class = "MattEverson.SourceAnalysis.AnalysisIdeOptionsPanel"/>
+		             label = "${res:AddIns.SourceAnalysis.Title}"
+		             class = "MattEverson.SourceAnalysis.AnalysisIdeOptionsPanel"/>
 	</Path>
 </AddIn>
diff --git a/src/AddIns/Misc/UnitTesting/UnitTesting.addin b/src/AddIns/Misc/UnitTesting/UnitTesting.addin
index 63dbf28f9a..846454b100 100644
--- a/src/AddIns/Misc/UnitTesting/UnitTesting.addin
+++ b/src/AddIns/Misc/UnitTesting/UnitTesting.addin
@@ -72,7 +72,7 @@
 			</MenuItem>
 		</Condition>
 	</Path>
-
+	
 	<Path name = "/SharpDevelop/Pads/UnitTestsPad/CommonTestCommands">
 		<ComplexCondition action="Disable">
 			<And>
@@ -162,11 +162,27 @@
 		          label = "${res:MainWindow.Windows.SearchResultPanel.CollapseAll.ToolTip}"
 		          class = "ICSharpCode.UnitTesting.CollapseAllCommand"/>-->
 	</Path>
-
+	
+	<Path name="/SharpDevelop/Workbench/MainMenu/QualityTools/Test">
+		<ComplexCondition action="Disable">
+			<And>
+				<Condition name="SolutionOpen"/>
+				<Not>
+					<Condition name="RunningTests"/>
+				</Not>
+			</And>
+			<MenuItem id      = "RunAll"
+			          icon    = "Icons.16x16.RunAllIcon"
+			          label   = "Run all tests"
+			          tooltip = "${res:NUnitPad.NUnitPadContent.RunAllTests}"
+			          class   = "ICSharpCode.UnitTesting.RunAllTestsInPadCommand"/>
+		</ComplexCondition>
+	</Path>
+	
 	<!-- Options panel -->
 	<Path name="/SharpDevelop/Dialogs/OptionsDialog/ToolsOptions">
 		<DialogPanel id="UnitTestingOptionsPanel"
-		       	     label="${res:ICSharpCode.NUnitPad.NUnitPadContent.PadName}"
-		       	     class="ICSharpCode.UnitTesting.UnitTestingOptionsPanel"/>
+		             label="${res:ICSharpCode.NUnitPad.NUnitPadContent.PadName}"
+		             class="ICSharpCode.UnitTesting.UnitTestingOptionsPanel"/>
 	</Path>
 </AddIn>