2 files changed, 2 insertions, 1 deletions
diff --git a/test/lib/puppettest.rb b/test/lib/puppettest.rb
index dc56d3138..4bf3bc54c 100755
--- a/test/lib/puppettest.rb
+++ b/test/lib/puppettest.rb
@@ -71,7 +71,7 @@ module PuppetTest
     end
 
     def rake?
-        $0 =~ /rake_test_loader/
+        $0 =~ /test_loader/
     end
 
     def setup
diff --git a/test/types/file.rb b/test/types/file.rb
index 61ee14694..321bfaef6 100755
--- a/test/types/file.rb
+++ b/test/types/file.rb
@@ -267,6 +267,7 @@ class TestFile < Test::Unit::TestCase
         def test_groupasroot
             file = mktestfile()
             [%x{groups}.chomp.split(/ /), Process.groups].flatten.each { |group|
+                next unless Puppet::Util.gid(group) # grr.
                 assert_nothing_raised() {
                     file[:group] = group
                 }