diff --git a/t/Session/Output.t b/t/Session/Output.t
new file mode 100644
index 000000000..e6fd66483
--- /dev/null
+++ b/t/Session/Output.t
@@ -0,0 +1,69 @@
+#-------------------------------------------------------------------
+# WebGUI is Copyright 2001-2006 Plain Black Corporation.
+#-------------------------------------------------------------------
+# Please read the legal notices (docs/legal.txt) and the license
+# (docs/license.txt) that came with this distribution before using
+# this software.
+#-------------------------------------------------------------------
+# http://www.plainblack.com                     info@plainblack.com
+#-------------------------------------------------------------------
+ 
+use FindBin;
+use strict;
+use lib "$FindBin::Bin/../lib";
+
+use WebGUI::Test;
+use WebGUI::Session;
+
+use Test::More; # increment this value for each test you create
+
+my $skip_tests = 7;
+my $num_tests = 1 + $skip_tests;
+
+plan tests => $num_tests;
+ 
+my $session = WebGUI::Test->session;
+ 
+# put your tests here
+
+my $output = $session->output;
+
+isa_ok($output, 'WebGUI::Session::Output', 'session has correct object type');
+
+my $recentVersion = $^V gt v5.8;
+
+SKIP: {
+	skip "You have an old perl", $skip_tests unless $recentVersion;
+
+	my $stdoutBuffer;
+	close STDOUT;
+	open STDOUT, '>', \$stdoutBuffer or die "Unable to tie STDOUT to a variable: $!\n";
+
+	my $otherHandleBuffer;
+	open my $otherHandle, '>', \$otherHandleBuffer or die "Unable to create second filehandle: $!\n";
+
+	$output->setHandle(undef);
+	is($output->{_handle}, undef, 'setHandle: handle cleared');
+
+	$output->print('Hello STDOUT');
+	is($stdoutBuffer, 'Hello STDOUT', 'print with no handle goes to STDOUT');
+
+	$output->print(' more stuff');
+	is($stdoutBuffer, 'Hello STDOUT more stuff', 'print: tied variables accumulate');
+
+	$session->user({userId => 3});
+	$output->print('^#;');
+	like($stdoutBuffer, qr/3\Z/, 'print: macro processing');
+
+	$output->print('^#;', 1);
+	like($stdoutBuffer, qr/\^#;\Z/, 'print: macro processing skipped');
+
+	$output->setHandle($otherHandle);
+	$output->print('New content');
+	is($otherHandleBuffer, 'New content', 'print: set to explicit handle');
+	unlike($stdoutBuffer, qr/New content\Z/, 'print: no leakage back to STDOUT');
+
+}
+
+END {
+}