diff --git a/include/test/NebulaTest.h b/include/test/NebulaTest.h
index 3768558f3d..bd73d4f201 100644
--- a/include/test/NebulaTest.h
+++ b/include/test/NebulaTest.h
@@ -27,6 +27,7 @@
 #include "UserPool.h"
 #include "VMTemplatePool.h"
 #include "DatastorePool.h"
+#include "ClusterPool.h"
 
 #include "VirtualMachineManager.h"
 #include "LifeCycleManager.h"
@@ -46,7 +47,8 @@ protected:
     NebulaTest():mysql(false), need_host_pool(false), need_vm_pool(false),
                 need_vnet_pool(false), need_image_pool(false), 
                 need_user_pool(false), need_template_pool(false),
-                need_group_pool(false),
+                need_group_pool(false), need_datastore_pool(false),
+                need_cluster_pool(false),
                 need_vmm(false),
                 need_im(false), need_tm(false),
                 need_lcm(false), need_dm(false),
@@ -69,6 +71,7 @@ public:
     bool need_template_pool;
     bool need_group_pool;
     bool need_datastore_pool;
+    bool need_cluster_pool;
 
     bool need_vmm;
     bool need_im;
@@ -111,6 +114,8 @@ public:
 
     virtual DatastorePool* create_dspool(SqlDB* db);
 
+    virtual ClusterPool* create_clpool(SqlDB* db);
+
     // ------------------------------------------------------------------------
     // Managers
     // ------------------------------------------------------------------------
diff --git a/src/test/Nebula.cc b/src/test/Nebula.cc
index f9d66ace3d..14684ebe4e 100644
--- a/src/test/Nebula.cc
+++ b/src/test/Nebula.cc
@@ -92,6 +92,11 @@ void Nebula::start()
         delete dspool;
     }
 
+    if ( clpool != 0)
+    {
+        delete clpool;
+    }
+
     if ( vmm != 0)
     {
         delete vmm;
@@ -190,6 +195,7 @@ void Nebula::start()
         GroupPool::bootstrap(db);
         AclManager::bootstrap(db);
         DatastorePool::bootstrap(db);
+        ClusterPool::bootstrap(db);
     }
     catch (exception&)
     {
@@ -205,6 +211,11 @@ void Nebula::start()
         string  default_image_type      = "OS";
         string  default_device_prefix   = "hd";
 
+        if (tester->need_cluster_pool)
+        {
+            clpool = tester->create_clpool(db);
+        }
+
         if (tester->need_vm_pool)
         {
             vmpool = tester->create_vmpool(db,hook_location,var_location);
diff --git a/src/test/NebulaTest.cc b/src/test/NebulaTest.cc
index b600a59924..1527e57982 100644
--- a/src/test/NebulaTest.cc
+++ b/src/test/NebulaTest.cc
@@ -67,6 +67,11 @@ DatastorePool* NebulaTest::create_dspool(SqlDB* db)
     return new DatastorePool(db);
 }
 
+ClusterPool* NebulaTest::create_clpool(SqlDB* db)
+{
+    return new ClusterPool(db);
+}
+
 // -----------------------------------------------------------
 // Managers
 // -----------------------------------------------------------
diff --git a/src/vm/test/SConstruct b/src/vm/test/SConstruct
index c2eb20b3b3..98fd9ad244 100644
--- a/src/vm/test/SConstruct
+++ b/src/vm/test/SConstruct
@@ -29,6 +29,8 @@ env.Prepend(LIBS=[
     'nebula_xml',
     'nebula_image',
     'nebula_datastore',
+    'nebula_cluster',
+    'nebula_um',
     'nebula_mad',
     'nebula_common',
     'nebula_log',
diff --git a/src/vm_template/test/SConstruct b/src/vm_template/test/SConstruct
index 20e5d89e58..b87e48c44f 100644
--- a/src/vm_template/test/SConstruct
+++ b/src/vm_template/test/SConstruct
@@ -22,6 +22,8 @@ env.Prepend(LIBS=[
     'nebula_vm',
     'nebula_vmtemplate',
     'nebula_hm',
+    'nebula_cluster',
+    'nebula_datastore',
     'nebula_vnm',
     'nebula_authm',
     'nebula_acl',
diff --git a/src/vnm/test/VirtualNetworkPoolTest.cc b/src/vnm/test/VirtualNetworkPoolTest.cc
index 0f0f3f1da1..a620f9cdaa 100644
--- a/src/vnm/test/VirtualNetworkPoolTest.cc
+++ b/src/vnm/test/VirtualNetworkPoolTest.cc
@@ -125,7 +125,9 @@ public:
 
         if( rc == 0 )
         {
-            return VirtualNetworkPool::allocate(uid, 0,"the_user","oneadmin", vn_template, oid, err);
+            return VirtualNetworkPool::allocate(uid, 0,"the_user","oneadmin",
+                    vn_template, oid, ClusterPool::NONE_CLUSTER_ID,
+                    ClusterPool::NONE_CLUSTER_NAME, err);
         }
         else
         {