diff --git a/test/message/2100bytes.js b/test/message/2100bytes.js
index 64a2a29a9c..f2c1aac3b1 100644
--- a/test/message/2100bytes.js
+++ b/test/message/2100bytes.js
@@ -1,48 +1,48 @@
 require('../common');
 
 sys = require('sys');
-sys.error([
- '***********************************************50',
- '**********************************************100',
- '**********************************************150',
- '**********************************************200',
- '**********************************************250',
- '**********************************************300',
- '**********************************************350',
- '**********************************************400',
- '**********************************************450',
- '**********************************************500',
- '**********************************************550',
- '**********************************************600',
- '**********************************************650',
- '**********************************************700',
- '**********************************************750',
- '**********************************************800',
- '**********************************************850',
- '**********************************************900',
- '**********************************************950',
- '*********************************************1000',
- '*********************************************1050',
- '*********************************************1100',
- '*********************************************1150',
- '*********************************************1200',
- '*********************************************1250',
- '*********************************************1300',
- '*********************************************1350',
- '*********************************************1400',
- '*********************************************1450',
- '*********************************************1500',
- '*********************************************1550',
- '*********************************************1600',
- '*********************************************1650',
- '*********************************************1700',
- '*********************************************1750',
- '*********************************************1800',
- '*********************************************1850',
- '*********************************************1900',
- '*********************************************1950',
- '*********************************************2000',
- '*********************************************2050',
- '*********************************************2100',
+sys.puts([
+ '_______________________________________________50',
+ '______________________________________________100',
+ '______________________________________________150',
+ '______________________________________________200',
+ '______________________________________________250',
+ '______________________________________________300',
+ '______________________________________________350',
+ '______________________________________________400',
+ '______________________________________________450',
+ '______________________________________________500',
+ '______________________________________________550',
+ '______________________________________________600',
+ '______________________________________________650',
+ '______________________________________________700',
+ '______________________________________________750',
+ '______________________________________________800',
+ '______________________________________________850',
+ '______________________________________________900',
+ '______________________________________________950',
+ '_____________________________________________1000',
+ '_____________________________________________1050',
+ '_____________________________________________1100',
+ '_____________________________________________1150',
+ '_____________________________________________1200',
+ '_____________________________________________1250',
+ '_____________________________________________1300',
+ '_____________________________________________1350',
+ '_____________________________________________1400',
+ '_____________________________________________1450',
+ '_____________________________________________1500',
+ '_____________________________________________1550',
+ '_____________________________________________1600',
+ '_____________________________________________1650',
+ '_____________________________________________1700',
+ '_____________________________________________1750',
+ '_____________________________________________1800',
+ '_____________________________________________1850',
+ '_____________________________________________1900',
+ '_____________________________________________1950',
+ '_____________________________________________2000',
+ '_____________________________________________2050',
+ '_____________________________________________2100',
 ].join('\n'));
 
diff --git a/test/message/2100bytes.out b/test/message/2100bytes.out
index 61e1383d3b..59040cc7c5 100644
--- a/test/message/2100bytes.out
+++ b/test/message/2100bytes.out
@@ -1,42 +1,42 @@
-***********************************************50
-**********************************************100
-**********************************************150
-**********************************************200
-**********************************************250
-**********************************************300
-**********************************************350
-**********************************************400
-**********************************************450
-**********************************************500
-**********************************************550
-**********************************************600
-**********************************************650
-**********************************************700
-**********************************************750
-**********************************************800
-**********************************************850
-**********************************************900
-**********************************************950
-*********************************************1000
-*********************************************1050
-*********************************************1100
-*********************************************1150
-*********************************************1200
-*********************************************1250
-*********************************************1300
-*********************************************1350
-*********************************************1400
-*********************************************1450
-*********************************************1500
-*********************************************1550
-*********************************************1600
-*********************************************1650
-*********************************************1700
-*********************************************1750
-*********************************************1800
-*********************************************1850
-*********************************************1900
-*********************************************1950
-*********************************************2000
-*********************************************2050
-*********************************************2100
+_______________________________________________50
+______________________________________________100
+______________________________________________150
+______________________________________________200
+______________________________________________250
+______________________________________________300
+______________________________________________350
+______________________________________________400
+______________________________________________450
+______________________________________________500
+______________________________________________550
+______________________________________________600
+______________________________________________650
+______________________________________________700
+______________________________________________750
+______________________________________________800
+______________________________________________850
+______________________________________________900
+______________________________________________950
+_____________________________________________1000
+_____________________________________________1050
+_____________________________________________1100
+_____________________________________________1150
+_____________________________________________1200
+_____________________________________________1250
+_____________________________________________1300
+_____________________________________________1350
+_____________________________________________1400
+_____________________________________________1450
+_____________________________________________1500
+_____________________________________________1550
+_____________________________________________1600
+_____________________________________________1650
+_____________________________________________1700
+_____________________________________________1750
+_____________________________________________1800
+_____________________________________________1850
+_____________________________________________1900
+_____________________________________________1950
+_____________________________________________2000
+_____________________________________________2050
+_____________________________________________2100
diff --git a/test/message/hello_world.js b/test/message/hello_world.js
index 2bb74e8ca9..2810b74851 100644
--- a/test/message/hello_world.js
+++ b/test/message/hello_world.js
@@ -1,3 +1,3 @@
 require('../common');
 
-error('hello world');
+puts('hello world');
diff --git a/test/message/testcfg.py b/test/message/testcfg.py
index 0aafdd7689..e41803df8c 100644
--- a/test/message/testcfg.py
+++ b/test/message/testcfg.py
@@ -49,9 +49,9 @@ class MessageTestCase(test.TestCase):
   def IsFailureOutput(self, output):
     f = file(self.expected)
     # Skip initial '#' comment and spaces
-    for line in f:
-      if (not line.startswith('#')) and (not line.strip()):
-        break
+    #for line in f:
+    #  if (not line.startswith('#')) and (not line.strip()):
+    #    break
     # Convert output lines to regexps that we can match
     env = { 'basename': basename(self.file) }
     patterns = [ ]