diff --git a/intel_nfv_ci_tests/tests/scenario/test_hugepages.py b/intel_nfv_ci_tests/tests/scenario/test_hugepages.py
index afc966c..0bbda8e 100644
--- a/intel_nfv_ci_tests/tests/scenario/test_hugepages.py
+++ b/intel_nfv_ci_tests/tests/scenario/test_hugepages.py
@@ -127,7 +127,7 @@ class TestHugepages(manager.ScenarioTest):
 
         flavor_id = self.create_flavor_with_extra_specs("hugepages_flavor")
 
-        self.create_server(wait_on_boot=True, flavor=flavor_id)
+        self.create_server(flavor=flavor_id, wait_until='ACTIVE')
 
         required_hugepages = 64 / (HUGEPAGE_SIZE / 1024.)  # ram/hugepages_size
         expected_hugepages = int(hugepages_init - required_hugepages)
diff --git a/intel_nfv_ci_tests/tests/scenario/test_numa_topology.py b/intel_nfv_ci_tests/tests/scenario/test_numa_topology.py
index c1e6cb1..d16ca06 100644
--- a/intel_nfv_ci_tests/tests/scenario/test_numa_topology.py
+++ b/intel_nfv_ci_tests/tests/scenario/test_numa_topology.py
@@ -102,9 +102,9 @@ class TestServerNumaBase(manager.NetworkScenarioTest):
         if flavor is None:
             flavor = self.create_flavor_with_numa()
         self.instance = self.create_server(
-            image=self.image_ref,
+            image_id=self.image_ref,
             flavor=flavor,
-            create_kwargs=create_kwargs)
+            **create_kwargs)
 
     def verify_ssh(self):
         # Obtain a floating IP