diff --git a/Tests/Cosmos.TestRunner.Core/DefaultEngineConfiguration.cs b/Tests/Cosmos.TestRunner.Core/DefaultEngineConfiguration.cs
index a378a64aa..e768ff506 100644
--- a/Tests/Cosmos.TestRunner.Core/DefaultEngineConfiguration.cs
+++ b/Tests/Cosmos.TestRunner.Core/DefaultEngineConfiguration.cs
@@ -13,9 +13,12 @@ namespace Cosmos.TestRunner.Core
 
             engine.AllowedSecondsInKernel = 30;
 
+            // Currently, there's still a bug somewhere for testing vmware.
+            engine.RunTargets.Remove(RunTargetEnum.VMware);
+
             engine.AddKernel(typeof(Cosmos.Compiler.Tests.SimpleWriteLine.Kernel.Kernel).Assembly.Location);
-            //engine.AddKernel(typeof(SimpleStructsAndArraysTest.Kernel).Assembly.Location);
-            //engine.AddKernel(typeof(VGACompilerCrash.Kernel).Assembly.Location);
+            engine.AddKernel(typeof(SimpleStructsAndArraysTest.Kernel).Assembly.Location);
+            engine.AddKernel(typeof(VGACompilerCrash.Kernel).Assembly.Location);
 
             // known bugs, therefor disabled for now:
         }
diff --git a/Tests/Cosmos.TestRunner.Core/Engine.Run.cs b/Tests/Cosmos.TestRunner.Core/Engine.Run.cs
index 7c6a24044..835e33e72 100644
--- a/Tests/Cosmos.TestRunner.Core/Engine.Run.cs
+++ b/Tests/Cosmos.TestRunner.Core/Engine.Run.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using Cosmos.Build.Common;
 using Cosmos.Build.MSBuild;
@@ -13,7 +14,8 @@ namespace Cosmos.TestRunner.Core
 {
     partial class Engine
     {
-        public int AllowedSecondsInKernel;
+        public int AllowedSecondsInKernel = 30;
+        public List<RunTargetEnum> RunTargets = new List<RunTargetEnum>((RunTargetEnum[])Enum.GetValues(typeof(RunTargetEnum)));
 
         private void ExecuteKernel(string assemblyFileName, RunConfiguration configuration)
         {
diff --git a/Tests/Cosmos.TestRunner.Core/Engine.cs b/Tests/Cosmos.TestRunner.Core/Engine.cs
index 93a738e50..b74d94686 100644
--- a/Tests/Cosmos.TestRunner.Core/Engine.cs
+++ b/Tests/Cosmos.TestRunner.Core/Engine.cs
@@ -80,14 +80,11 @@ namespace Cosmos.TestRunner.Core
 
         private IEnumerable<RunConfiguration> GetRunConfigurations()
         {
-            //yield return new RunConfiguration { IsELF = true, RunTarget = RunTargetEnum.VMware };
-            yield return new RunConfiguration { IsELF = true, RunTarget = RunTargetEnum.Bochs };
-
-            //foreach (RunTargetEnum xTarget in Enum.GetValues(typeof(RunTargetEnum)))
-            //{
-            //    yield return new RunConfiguration {IsELF = true, RunTarget = xTarget};
-            //    //yield return new RunConfiguration { IsELF = false, RunTarget = xTarget };
-            //}
+            foreach (RunTargetEnum xTarget in RunTargets)
+            {
+                yield return new RunConfiguration { IsELF = true, RunTarget = xTarget };
+                //yield return new RunConfiguration { IsELF = false, RunTarget = xTarget };
+            }
         }
     }
 }