diff --git a/tests/pillar/compute_cluster.sls b/tests/pillar/compute_cluster.sls
index c3a55e2..9534c83 100644
--- a/tests/pillar/compute_cluster.sls
+++ b/tests/pillar/compute_cluster.sls
@@ -95,3 +95,5 @@
       user: nova
       group: cinder
       dynamic_ownership: 1
+    consoleauth:
+      token_ttl: 600
diff --git a/tests/pillar/compute_cluster_vmware.sls b/tests/pillar/compute_cluster_vmware.sls
index 8cf5646..8953178 100644
--- a/tests/pillar/compute_cluster_vmware.sls
+++ b/tests/pillar/compute_cluster_vmware.sls
@@ -80,3 +80,5 @@
       images_volume_group: nova_vg
       volume_clear: zero
       volume_clear_size: 0
+    consoleauth:
+      token_ttl: 600
diff --git a/tests/pillar/compute_cluster_vmware_queens.sls b/tests/pillar/compute_cluster_vmware_queens.sls
index d508fc1..b704198 100644
--- a/tests/pillar/compute_cluster_vmware_queens.sls
+++ b/tests/pillar/compute_cluster_vmware_queens.sls
@@ -80,3 +80,5 @@
       images_volume_group: nova_vg
       volume_clear: zero
       volume_clear_size: 0
+    consoleauth:
+      token_ttl: 600
diff --git a/tests/pillar/compute_single.sls b/tests/pillar/compute_single.sls
index b000da7..6a15ae1 100644
--- a/tests/pillar/compute_single.sls
+++ b/tests/pillar/compute_single.sls
@@ -68,3 +68,5 @@
       user: nova
       group: cinder
       dynamic_ownership: 1
+    consoleauth:
+      token_ttl: 600
diff --git a/tests/pillar/compute_single_config_drive_options.sls b/tests/pillar/compute_single_config_drive_options.sls
index 78cf088..739f876 100644
--- a/tests/pillar/compute_single_config_drive_options.sls
+++ b/tests/pillar/compute_single_config_drive_options.sls
@@ -66,3 +66,5 @@
       cdrom: True
       format: iso9660
       inject_password: True
+    consoleauth:
+      token_ttl: 600
diff --git a/tests/pillar/control_cluster.sls b/tests/pillar/control_cluster.sls
index 24fc414..558a692 100644
--- a/tests/pillar/control_cluster.sls
+++ b/tests/pillar/control_cluster.sls
@@ -11,7 +11,6 @@
     cpu_allocation_ratio: 16.0
     ram_allocation_ratio: 1.5
     disk_allocation_ratio: 1.0
-    consoleauth_token_ttl: 600
     workers: 8
     bind:
       private_address: 127.0.0.1
@@ -76,6 +75,8 @@
       compute: liberty
     barbican:
       enabled: true
+    consoleauth:
+      token_ttl: 600
 apache:
   server:
     enabled: true
diff --git a/tests/pillar/control_single.sls b/tests/pillar/control_single.sls
index f94743b..3fff016 100644
--- a/tests/pillar/control_single.sls
+++ b/tests/pillar/control_single.sls
@@ -81,6 +81,8 @@
         enabled: true
         strategy: ENCRYPT
         secret_key: secret
+    consoleauth:
+      token_ttl: 600
     policy:
       'context_is_admin': 'role:admin or role:administrator'
       'compute:create': 'rule:admin_or_owner'