diff --git a/t/Session/Env.t b/t/Session/Env.t
index bd465e2e2..e0c2e2084 100644
--- a/t/Session/Env.t
+++ b/t/Session/Env.t
@@ -16,21 +16,25 @@ use WebGUI::Test;
 use WebGUI::Session;
 
 use Test::More tests => 3; # increment this value for each test you create
+use Test::MockObject::Extends;
 
 my $session = WebGUI::Test->session;
 
-cmp_ok($session->env->get("PATH"), 'ne', "", "get() one entry");
+
+cmp_ok($session->env->get("PATH"), 'ne', "", "get() one valid entry");
 
 #Replace the ENV hash so that we can test getIp.
 
-my $origEnvHash = $session->env->{_env};
+my $env = $session->env;
+$env    = Test::MockObject::Extends->new($env);
 
-my %newEnv = ( REMOTE_ADDR => '192.168.0.2' );
+my %mockEnv = (
+    REMOTE_ADDR          => '192.168.0.2',
+);
 
-$session->env->{_env} = \%newEnv;
+$env->mock('get', sub { return $mockEnv{$_[1]}});
 
-is ($session->env->getIp(), $newEnv{'REMOTE_ADDR'}, 'getIp');
+is ($env->getIp(), $mockEnv{'REMOTE_ADDR'}, 'getIp');
 
-$newEnv{'HTTP_X_FORWARDED_FOR'} = '10.0.2.5';
-
-is ($session->env->getIp(), $newEnv{'HTTP_X_FORWARDED_FOR'}, 'getIp with HTTP forwarding');
+$mockEnv{HTTP_X_FORWARDED_FOR} = '10.0.2.5',
+is ($env->getIp(), $mockEnv{'HTTP_X_FORWARDED_FOR'}, 'getIp with HTTP forwarding');