diff --git a/global/overlay/etc/puppet/setup_cosmos_modules b/global/overlay/etc/puppet/setup_cosmos_modules
index 4ea9dbb3..c3ea5eff 100755
--- a/global/overlay/etc/puppet/setup_cosmos_modules
+++ b/global/overlay/etc/puppet/setup_cosmos_modules
@@ -23,7 +23,7 @@ except OSError:
 else:
     domainname =  '.'.join(fqdn.split(".")[1:])
     environ = "prod"
-    pattern = r"(.+test.+\.komreg\.net)|(.+\.test\.sveidas\.se)"
+    pattern = r"(.+test.*\.komreg\.net)|(.+\.test\.sveidas\.se)"
 
     if re.match(pattern, fqdn):
        environ = "test"