Index: /tests/SystemQueue-tests.cc
===================================================================
--- /tests/SystemQueue-tests.cc	(revision 12752)
+++ /tests/SystemQueue-tests.cc	(revision 12753)
@@ -266,5 +266,5 @@
 {
 public:
-    
+
 /**
  *  typical delay time
@@ -275,5 +275,27 @@
 #define DELAY_TIME 10  // ms
 #define DELAY_MARGIN 1000  // microseconds (1/1000 ms)
-    
+
+
+    /// constructor
+    SystemQueueTimingTest() :
+        SystemQueueTest()  /* super constructor */,
+        sysq( SystemQueue::instance() )
+    {
+    }
+    
+    virtual void SetUp()
+    {
+        // start SystemQueue
+        sysq.run();
+    }
+    
+
+    virtual void TearDown()
+    {
+        // stop SystemQueue
+        sysq.cancel();
+    }
+
+    SystemQueue& sysq;
 };
 
@@ -284,10 +306,4 @@
 TEST_F(SystemQueueTimingTest, DelayedCall)
 {
-    SystemQueue& sysq = SystemQueue::instance();
-    checkmark = false;  // just to be sure..
-    
-    // start
-    sysq.run();
-    
     // scheduleCall
     sysq.scheduleCall(
@@ -301,7 +317,4 @@
     wait_for_checkmark(MAX_WAIT);
     
-    // stop
-    sysq.cancel();
-    
     EXPECT_TRUE( checkmark ) << "Deleyed function was not called within delaytime (" 
         << DELAY_TIME << " ms) + " << (MAX_WAIT + DELAY_MARGIN) << " microseconds.";