diff --git a/runtest/salttest/modules/openstack/novav21.sls b/runtest/salttest/modules/openstack/novav21.sls
index ba6b1bc..782f2a3 100644
--- a/runtest/salttest/modules/openstack/novav21.sls
+++ b/runtest/salttest/modules/openstack/novav21.sls
@@ -1,12 +1,7 @@
 {%- set Nova_Aggregate_Test_Name = 'NovaAggregateTestName' %}
 {%- set Nova_Test_Zone = 'NovaTestZone' %}
 {%- set Nova_Test_Flavor = 'NovaTestFlavor' %}
-{%- if salt['grains.get']('saltversion') < '2017.7.0' %}
 {%- set Nova_Test_Flavor_ID = salt['cmd.run']('cat /proc/sys/kernel/random/uuid') %}
-{%- else %}
-{#NOTE random uuid function added in 2017.7.0 salt#}
-{%- set Nova_Test_Flavor_ID = 'random'| uuid %}
-{%- endif %}
 {%- set Nova_Test_Keypair_Name = 'NovaTestKeypairName' %}
 {%- set Nova_Test_Keypair_Pub_Key = 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDx8nkQv/zgGgB4rMYmIf+6A4l6Rr+o/6lHBQdW5aYd44bd8JttDCE/F/pNRr0lRE+PiqSPO8nDPHw0010JeMH9gYgnnFlyY3/OcJ02RhIPyyxYpv9FhY+2YiUkpwFOcLImyrxEsYXpD/0d3ac30bNH6Sw9JD9UZHYcpSxsIbECHw== Generated-by-Nova' %}
 
diff --git a/runtest/salttest/states/openstack/novav21.sls b/runtest/salttest/states/openstack/novav21.sls
index b4d81af..709e0da 100644
--- a/runtest/salttest/states/openstack/novav21.sls
+++ b/runtest/salttest/states/openstack/novav21.sls
@@ -1,10 +1,5 @@
 {%- set Nova_Test_Flavor = 'NovaTestFlavor' %}
-{%- if salt['grains.get']('saltversion') < '2017.7.0' %}
 {%- set Nova_Test_Flavor_ID = salt['cmd.run']('cat /proc/sys/kernel/random/uuid') %}
-{%- else %}
-{#NOTE random uuid function added in 2017.7.0 salt#}
-{%- set Nova_Test_Flavor_ID = 'random'| uuid %}
-{%- endif %}
 {%- set Nova_Aggregate_Test_Name = 'NovaAggregateTestName '%}
 {%- set Nova_Test_Keypair_Name = 'NovaTestKeypairName' %}
 {%- set Nova_Test_Keypair_Pub_Key = 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDx8nkQv/zgGgB4rMYmIf+6A4l6Rr+o/6lHBQdW5aYd44bd8JttDCE/F/pNRr0lRE+PiqSPO8nDPHw0010JeMH9gYgnnFlyY3/OcJ02RhIPyyxYpv9FhY+2YiUkpwFOcLImyrxEsYXpD/0d3ac30bNH6Sw9JD9UZHYcpSxsIbECHw== Generated-by-Nova' %}