Index: /tests/CMakeLists.txt
===================================================================
--- /tests/CMakeLists.txt	(revision 12746)
+++ /tests/CMakeLists.txt	(revision 12747)
@@ -58,7 +58,23 @@
 include_directories("${ariba_SOURCE_DIR}/source/" "${ariba_BINARY_DIR}/source/")
 
-add_executable(HelloWold_test
+
+## Unit tests ##
+
+# Hello World
+add_executable(HelloWold-test
     HelloWorld.cc
 )
+
+target_link_libraries(HelloWold-test gtest gtest_main)
+add_test( HelloWorld HelloWold-test )
+
+# SystemQueue
+add_executable(SystemQueue-tests
+    SystemQueue-tests.cc
+)
+
+target_link_libraries(SystemQueue-tests gtest gtest_main ariba)
+add_test( SystemQueue SystemQueue-tests )
+
 
 #if(${BUILD_STATIC_BINS})
@@ -74,5 +90,2 @@
 
 # target_link_libraries(pingpong ariba ${Boost_LIBRARIES})
-
-target_link_libraries(HelloWold_test gtest gtest_main)
-add_test( HelloWorld HelloWold_test )
Index: /tests/SystemQueue-tests.cc
===================================================================
--- /tests/SystemQueue-tests.cc	(revision 12747)
+++ /tests/SystemQueue-tests.cc	(revision 12747)
@@ -0,0 +1,15 @@
+#include "gtest/gtest.h"
+#include "ariba/utility/system/SystemQueue.h"
+
+using namespace ::testing;
+using namespace ariba::utility;
+
+
+TEST(SystemQueue, Test1)
+{
+    SystemQueue& sysq = SystemQueue::instance();
+    SystemQueue& sysq2 = SystemQueue::instance();
+    
+    ASSERT_FALSE( sysq.isRunning() );
+    ASSERT_TRUE( &sysq == &sysq2 );
+}