diff --git a/suites/upgrade/hammer-x/f-h-x-offline/0-install.yaml b/suites/upgrade/hammer-x/f-h-x-offline/0-install.yaml
new file mode 100644
index 00000000000..35711bf7842
--- /dev/null
+++ b/suites/upgrade/hammer-x/f-h-x-offline/0-install.yaml
@@ -0,0 +1,6 @@
+roles:
+- [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, client.0]
+tasks:
+- install:
+    branch: firefly
+- ceph:
diff --git a/suites/upgrade/hammer-x/f-h-x-offline/1-pre.yaml b/suites/upgrade/hammer-x/f-h-x-offline/1-pre.yaml
new file mode 100644
index 00000000000..fe6c376c580
--- /dev/null
+++ b/suites/upgrade/hammer-x/f-h-x-offline/1-pre.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+    branch: firefly
+    clients:
+      client.0:
+        - rados/test.sh
diff --git a/suites/upgrade/hammer-x/f-h-x-offline/2-upgrade.yaml b/suites/upgrade/hammer-x/f-h-x-offline/2-upgrade.yaml
new file mode 100644
index 00000000000..11d923e2d0e
--- /dev/null
+++ b/suites/upgrade/hammer-x/f-h-x-offline/2-upgrade.yaml
@@ -0,0 +1,10 @@
+tasks:
+- install.upgrade:
+- ceph.restart: [mon.a, mon.b, mon.c]
+- ceph.stop: [osd.0, osd.1, osd.2]
+- exec:
+    mon.a:
+      - ceph osd down 0 1 2
+- ceph.restart: [osd.0, osd.1, osd.2]
+- sleep:
+    duration: 10
diff --git a/suites/upgrade/hammer-x/f-h-x-offline/3-infernalis.yaml b/suites/upgrade/hammer-x/f-h-x-offline/3-infernalis.yaml
new file mode 120000
index 00000000000..0465c112be0
--- /dev/null
+++ b/suites/upgrade/hammer-x/f-h-x-offline/3-infernalis.yaml
@@ -0,0 +1 @@
+../../../../releases/infernalis.yaml
\ No newline at end of file
diff --git a/suites/upgrade/hammer-x/f-h-x-offline/4-after.yaml b/suites/upgrade/hammer-x/f-h-x-offline/4-after.yaml
new file mode 100644
index 00000000000..fe6c376c580
--- /dev/null
+++ b/suites/upgrade/hammer-x/f-h-x-offline/4-after.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+    branch: firefly
+    clients:
+      client.0:
+        - rados/test.sh
diff --git a/suites/upgrade/hammer-x/f-h-x-offline/README b/suites/upgrade/hammer-x/f-h-x-offline/README
new file mode 100644
index 00000000000..98153e03343
--- /dev/null
+++ b/suites/upgrade/hammer-x/f-h-x-offline/README
@@ -0,0 +1,4 @@
+Verify that we can upgrade straight from firefly to x without ever installing
+hammer.
+
+This would be an offline upgrade, though.. all osds have to be restarted!