diff --git a/tests/integration/linodes/fixtures.py b/tests/integration/linodes/fixtures.py
index 24ed4aeb..31f8766e 100644
--- a/tests/integration/linodes/fixtures.py
+++ b/tests/integration/linodes/fixtures.py
@@ -321,13 +321,9 @@ def linode_interface_public(linode_cloud_firewall):
         interfaces='[{"public": {"ipv4": {"addresses": [{"primary": true}]}}, "default_route": {"ipv4": true, "ipv6": true }, "firewall_id":'
         + linode_cloud_firewall
         + "}]",
+        booted=False,
     )
 
-    wait_until(linode_id=linode_id, timeout=300, status="running")
-
-    # TODO: add support of creating a offline linode in `create_linode` then remove this workaround
-    exec_test_command(BASE_CMDS["linodes"] + ["shutdown", linode_id])
-
     wait_until(linode_id=linode_id, timeout=60, status="offline")
 
     yield linode_id
diff --git a/tests/integration/linodes/helpers.py b/tests/integration/linodes/helpers.py
index d95cc34b..d923baa1 100644
--- a/tests/integration/linodes/helpers.py
+++ b/tests/integration/linodes/helpers.py
@@ -62,6 +62,7 @@ def create_linode(
     disk_encryption=False,
     interface_generation: str = None,
     interfaces: str = None,
+    booted: bool = True,
 ):
     # Base command
     command = BASE_CMDS["linodes"] + [
@@ -78,6 +79,8 @@ def create_linode(
         firewall_id,
         "--disk_encryption",
         "enabled" if disk_encryption else "disabled",
+        "--booted",
+        str(booted).lower(),
     ]
 
     if interface_generation: