diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..2c03717
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=review.opendev.org
+port=29418
+project=openstack/charm-cinder-solidfire.git
diff --git a/.zuul.yaml b/.zuul.yaml
new file mode 100644
index 0000000..0eed196
--- /dev/null
+++ b/.zuul.yaml
@@ -0,0 +1,4 @@
+- project:
+    templates:
+      - openstack-python3-ussuri-jobs
+      - openstack-cover-jobs
diff --git a/osci.yaml b/osci.yaml
new file mode 100644
index 0000000..0903b1a
--- /dev/null
+++ b/osci.yaml
@@ -0,0 +1,9 @@
+- project:
+    templates:
+      - charm-unit-jobs
+    check:
+      jobs:
+        - focal-ussuri
+    vars:
+      needs_charm_build: true
+      charm_build_name: cinder-solidfire
diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml
index 95ae91b..b033e64 100644
--- a/tests/bundles/focal-ussuri.yaml
+++ b/tests/bundles/focal-ussuri.yaml
@@ -53,17 +53,15 @@ applications:
       overwrite: "true"
     to:
       - '5'
-  
-  # SUBORDINATES 
+
   cinder-mysql-router:
     charm: cs:~openstack-charmers-next/mysql-router
-  
-  # src charm
+
   cinder-solidfire:
-    charm: cs:~gustavosr98/cinder-solidfire
+    charm: ../../cinder-solidfire
     options:
       san-ip: 10.0.0.5
-      san-login: username 
+      san-login: username
       san-password: password
 
 relations:
diff --git a/tests/tests_cinder_solidfire.py b/tests/tests_cinder_solidfire.py
index a42e771..25a2d7f 100644
--- a/tests/tests_cinder_solidfire.py
+++ b/tests/tests_cinder_solidfire.py
@@ -54,7 +54,8 @@ class CinderSolidfireTest(test_utils.OpenStackBaseTest):
             model_name=self.model_name,
             timeout=2)
 
-    def test_create_volume(self):
+    # Disabled while there is no hardware Solidfire appliance
+    def _disabled_test_create_volume(self):
         test_vol_name = "zaza{}".format(uuid.uuid1().fields[0])
         vol_new = self.cinder_client.volumes.create(
             name=test_vol_name,