diff --git a/Tests/Cosmos.TestRunner.Core/DefaultEngineConfiguration.cs b/Tests/Cosmos.TestRunner.Core/DefaultEngineConfiguration.cs
index 8761f10e7..e644ddda9 100644
--- a/Tests/Cosmos.TestRunner.Core/DefaultEngineConfiguration.cs
+++ b/Tests/Cosmos.TestRunner.Core/DefaultEngineConfiguration.cs
@@ -14,8 +14,8 @@ namespace Cosmos.TestRunner.Core
 
             engine.AllowedSecondsInKernel = 120;
 
-            // If you want to exclude a testing platform, modify uncomment and modify the following line
-            //engine.RunTargets.Remove(RunTargetEnum.VMware);
+            // If you want to test only specific platforms, add them to the list, like next line. By default, all platforms are ran.
+            // engine.RunTargets.Add(RunTargetEnum.Bochs);
 
             // if you're working on the compiler (or other lower parts), you can choose to run the compiler in process
             // 1 thing to keep in mind though, is that this only works with 1 kernel at a time!
diff --git a/Tests/Cosmos.TestRunner.Core/Engine.Run.cs b/Tests/Cosmos.TestRunner.Core/Engine.Run.cs
index 1aaa39e92..99fb42a74 100644
--- a/Tests/Cosmos.TestRunner.Core/Engine.Run.cs
+++ b/Tests/Cosmos.TestRunner.Core/Engine.Run.cs
@@ -15,7 +15,7 @@ namespace Cosmos.TestRunner.Core
     partial class Engine
     {
         public int AllowedSecondsInKernel = 30;
-        public List<RunTargetEnum> RunTargets = new List<RunTargetEnum>((RunTargetEnum[])Enum.GetValues(typeof(RunTargetEnum)));
+        public List<RunTargetEnum> RunTargets = new List<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 d31437e90..97c5030ca 100644
--- a/Tests/Cosmos.TestRunner.Core/Engine.cs
+++ b/Tests/Cosmos.TestRunner.Core/Engine.cs
@@ -43,6 +43,11 @@ namespace Cosmos.TestRunner.Core
                 throw new InvalidOperationException("No OutputHandler set!");
             }
 
+            if (RunTargets.Count == 0)
+            {
+                RunTargets.AddRange((RunTargetEnum[])Enum.GetValues(typeof(RunTargetEnum)));
+            }
+
             OutputHandler.ExecutionStart();
             try
             {