diff --git a/spec/unit/parser/functions_spec.rb b/spec/unit/parser/functions_spec.rb
index 8240a184c..7eb6f299b 100755
--- a/spec/unit/parser/functions_spec.rb
+++ b/spec/unit/parser/functions_spec.rb
@@ -1,101 +1,105 @@
 #!/usr/bin/env rspec
 require 'spec_helper'
 
 describe Puppet::Parser::Functions do
 
   after(:each) do
     # Rationale:
     # our various tests will almost all register to Pupet::Parser::Functions
     # a new function called "name". All tests are required to stub Puppet::Parser::Scope
     # so that +no+ new real ruby method are defined.
     # After each test, we want to leave the whole Puppet::Parser::Functions environment
     # as it was before we were called, hence we call rmfunction (which might not succeed
     # if the function hasn't been registered in the test). It is also important in this
     # section to stub +remove_method+ here so that we don't pollute the scope.
     Puppet::Parser::Scope.stubs(:remove_method)
     begin
       Puppet::Parser::Functions.rmfunction("name")
     rescue
     end
   end
 
   it "should have a method for returning an environment-specific module" do
-    Puppet::Parser::Functions.environment_module("myenv").should be_instance_of(Module)
+    Puppet::Parser::Functions.environment_module(Puppet::Node::Environment.new("myenv")).should be_instance_of(Module)
   end
 
   it "should use the current default environment if no environment is provided" do
     Puppet::Parser::Functions.environment_module.should be_instance_of(Module)
   end
 
+  it "should be able to retrieve environment modules asked for by name rather than instance" do
+    Puppet::Parser::Functions.environment_module(Puppet::Node::Environment.new("myenv")).should equal(Puppet::Parser::Functions.environment_module("myenv"))
+  end
+
   describe "when calling newfunction" do
     before do
       @module = Module.new
       Puppet::Parser::Functions.stubs(:environment_module).returns @module
     end
 
     it "should create the function in the environment module" do
       @module.expects(:define_method).with { |name,block| name == "function_name" }
 
       Puppet::Parser::Functions.newfunction("name", :type => :rvalue)
     end
 
     it "should raise an error if the function already exists" do
       @module.expects(:define_method).with { |name,block| name == "function_name" }.once
       Puppet::Parser::Functions.newfunction("name", :type => :rvalue)
 
       lambda { Puppet::Parser::Functions.newfunction("name", :type => :rvalue) }.should raise_error
     end
 
     it "should raise an error if the function type is not correct" do
       @module.expects(:define_method).with { |name,block| name == "function_name" }.never
 
       lambda { Puppet::Parser::Functions.newfunction("name", :type => :unknown) }.should raise_error
     end
   end
 
   describe "when calling rmfunction" do
     before do
       @module = Module.new
       Puppet::Parser::Functions.stubs(:environment_module).returns @module
     end
 
     it "should remove the function in the scope class" do
       @module.expects(:define_method).with { |name,block| name == "function_name" }
       Puppet::Parser::Functions.newfunction("name", :type => :rvalue)
 
       @module.expects(:remove_method).with("function_name").once
 
       Puppet::Parser::Functions.rmfunction("name")
     end
 
     it "should raise an error if the function doesn't exists" do
       lambda { Puppet::Parser::Functions.rmfunction("name") }.should raise_error
     end
   end
 
   describe "when calling function to test function existance" do
     before do
       @module = Module.new
       Puppet::Parser::Functions.stubs(:environment_module).returns @module
     end
 
     it "should return false if the function doesn't exist" do
       Puppet::Parser::Functions.autoloader.stubs(:load)
 
       Puppet::Parser::Functions.function("name").should be_false
     end
 
     it "should return its name if the function exists" do
       @module.expects(:define_method).with { |name,block| name == "function_name" }
       Puppet::Parser::Functions.newfunction("name", :type => :rvalue)
 
       Puppet::Parser::Functions.function("name").should == "function_name"
     end
 
     it "should try to autoload the function if it doesn't exist yet" do
       Puppet::Parser::Functions.autoloader.expects(:load)
 
       Puppet::Parser::Functions.function("name")
     end
   end
 end