diff --git a/src/simulator/simulator.cc b/src/simulator/simulator.cc
index a61801175..0eae117b1 100644
--- a/src/simulator/simulator.cc
+++ b/src/simulator/simulator.cc
@@ -316,6 +316,8 @@ Simulator::GetImplementation (void)
 #include "list-scheduler.h"
 #include "heap-scheduler.h"
 #include "map-scheduler.h"
+#include "calendar-scheduler.h"
+#include "ns2-calendar-scheduler.h"
 
 namespace ns3 {
 
@@ -742,6 +744,20 @@ SimulatorTests::RunTests (void)
     }
   Simulator::Destroy ();
 
+  Simulator::SetScheduler (CreateObject<CalendarScheduler> ());
+  if (!RunOneTest ()) 
+    {
+      result = false;
+    }
+  Simulator::Destroy ();
+
+  Simulator::SetScheduler (CreateObject<Ns2CalendarScheduler> ());
+  if (!RunOneTest ()) 
+    {
+      result = false;
+    }
+  Simulator::Destroy ();
+
   Simulator::Schedule (Seconds (0.0), &foo0);
   Simulator::Schedule (Seconds (0.0), &foo1, 0);
   Simulator::Schedule (Seconds (0.0), &foo2, 0, 0);