diff --git a/src/simulator/scheduler-heap.cc b/src/simulator/scheduler-heap.cc
index 8a7493b85..d37b9dbec 100644
--- a/src/simulator/scheduler-heap.cc
+++ b/src/simulator/scheduler-heap.cc
@@ -249,3 +249,37 @@ SchedulerHeap::RealIsValid (EventId id)
   return true;
 }
 }; // namespace ns3
+
+#ifdef RUN_SELF_TESTS
+
+#include "ns3/test.h"
+
+namespace ns3 {
+
+class SchedulerHeapTest : public Test 
+{
+public:
+  SchedulerHeapTest ();
+  virtual ~SchedulerHeapTest ();
+  virtual bool RunTests (void);
+};
+
+SchedulerHeapTest::SchedulerHeapTest ()
+  : Test ("SchedulerHeap")
+{}
+SchedulerHeapTest::~SchedulerHeapTest ()
+{}
+
+bool 
+SchedulerHeapTest::RunTests (void)
+{
+  bool ok = true;
+  return ok;
+}
+
+static SchedulerHeapTest g_schedulerHeapTest;
+
+}; // namespace ns3
+
+
+#endif /* RUN_SELF_TESTS */