diff --git a/providers/gogrid/src/test/java/org/jclouds/gogrid/compute/GoGridTemplateBuilderLiveTest.java b/providers/gogrid/src/test/java/org/jclouds/gogrid/compute/GoGridTemplateBuilderLiveTest.java
index c5cd96112a..729bdf0815 100644
--- a/providers/gogrid/src/test/java/org/jclouds/gogrid/compute/GoGridTemplateBuilderLiveTest.java
+++ b/providers/gogrid/src/test/java/org/jclouds/gogrid/compute/GoGridTemplateBuilderLiveTest.java
@@ -53,13 +53,13 @@ public class GoGridTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest {
          public boolean apply(OsFamilyVersion64Bit input) {
             switch (input.family) {
                case RHEL:
-                  return input.version.equals("") || input.version.equals("5.4");
+                  return input.version.equals("") || input.version.matches("5.[67]");
                case DEBIAN:
-                  return input.version.equals("") || input.version.equals("5.0");
+                  return input.version.equals("") || input.version.matches("[56].0");
                case UBUNTU:
                   return input.version.equals("") || input.version.equals("10.04");
                case CENTOS:
-                  return input.version.equals("") || input.version.matches("5.[35]");
+                  return input.version.equals("") || input.version.matches("5.[56]") || input.version.equals("6.0");
                case WINDOWS:
                   return input.version.equals("") || input.version.matches("200[38]");
                default: