diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test
index 426fa0ea7c99e4765c2fe8bc6171cc6124328ee6..867ad706c8c086e9fe0427b76e16002d08686958 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test
@@ -22909,40 +22909,45 @@ End = 1
 Frequency = 1
 [1] FALSE
 
-##com.oracle.truffle.r.test.builtins.TestBuiltin_dump.testDumpData#
-#{ x <- 10; .Internal(dump('x', stdout(), environment(), .deparseOpts('all'), TRUE))}
+##com.oracle.truffle.r.test.builtins.TestBuiltin_dump.testDumpData#Output.IgnoreWhitespace#
+#{ x <- 10; .Internal(dump("x", stdout(), environment(), .deparseOpts("all"), TRUE))}
 x <-
 10
 
-##com.oracle.truffle.r.test.builtins.TestBuiltin_dump.testDumpData#
-#{ x <- 1:10; .Internal(dump('x', stdout(), environment(), .deparseOpts('all'), TRUE))}
+##com.oracle.truffle.r.test.builtins.TestBuiltin_dump.testDumpData#Output.IgnoreWhitespace#
+#{ x <- 1:10; .Internal(dump("x", stdout(), environment(), .deparseOpts("all"), TRUE))}
 x <-
 1:10
 
-##com.oracle.truffle.r.test.builtins.TestBuiltin_dump.testDumpData#
-#{ x <- c(10,20,25); .Internal(dump('x', stdout(), environment(), .deparseOpts('all'), TRUE))}
+##com.oracle.truffle.r.test.builtins.TestBuiltin_dump.testDumpData#Output.IgnoreWhitespace#
+#{ x <- c(10,20,25); .Internal(dump("x", stdout(), environment(), .deparseOpts("all"), TRUE))}
 x <-
 c(10, 20, 25)
 
-##com.oracle.truffle.r.test.builtins.TestBuiltin_dump.testDumpData#
-#{ x <- list(a=10,b=20); .Internal(dump('x', stdout(), environment(), .deparseOpts('all'), TRUE))}
+##com.oracle.truffle.r.test.builtins.TestBuiltin_dump.testDumpData#Output.IgnoreWhitespace#
+#{ x <- list(a=10,b=20); .Internal(dump("x", stdout(), environment(), .deparseOpts("all"), TRUE))}
 x <-
 structure(list(a = 10, b = 20), .Names = c("a", "b"))
 
-##com.oracle.truffle.r.test.builtins.TestBuiltin_dump.testDumpFunctions#
-#{ foo <- function() cat('Hello'); bar <- function() cat('World'); .Internal(dump(c('foo', 'bar'), stdout(), environment(), .deparseOpts('all'), TRUE))}
+##com.oracle.truffle.r.test.builtins.TestBuiltin_dump.testDumpFunctions#Output.IgnoreWhitespace#
+#{ foo <- function() cat("Hello"); bar <- function() cat("World"); .Internal(dump(c("foo", "bar"), stdout(), environment(), .deparseOpts("all"), TRUE))}
 foo <-
-function() cat('Hello')
+function() cat("Hello")
 bar <-
-function() cat('World')
+function() cat("World")
 
-##com.oracle.truffle.r.test.builtins.TestBuiltin_dump.testDumpFunctions#
-#{ fun <- function() print('Hello, World!'); .Internal(dump('fun', stdout(), environment(), .deparseOpts('all'), TRUE))}
+##com.oracle.truffle.r.test.builtins.TestBuiltin_dump.testDumpFunctions#Output.IgnoreWhitespace#
+#{ fun <- function() print("Hello, World!"); .Internal(dump("fun", stdout(), environment(), .deparseOpts("all"), TRUE))}
 fun <-
-function() print('Hello, World!')
+function() print("Hello, World!")
 
-##com.oracle.truffle.r.test.builtins.TestBuiltin_dump.testDumpLanguage#
-#{ x <- quote(2 + 3); .Internal(dump('x', stdout(), environment(), .deparseOpts('all'), TRUE))}
+##com.oracle.truffle.r.test.builtins.TestBuiltin_dump.testDumpLanguage#Output.IgnoreWhitespace#
+#{ x <- 2 + 3; .Internal(dump("x", stdout(), environment(), .deparseOpts("all"), FALSE))}
+x <-
+5
+
+##com.oracle.truffle.r.test.builtins.TestBuiltin_dump.testDumpLanguage#Output.IgnoreWhitespace#
+#{ x <- quote(2 + 3); .Internal(dump("x", stdout(), environment(), .deparseOpts("all"), FALSE))}
 x <-
 quote(2 + 3)
 
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_dump.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_dump.java
index 8cc329e4ecccccf66ba34872fd267de9785074c5..3dec7af449231446123d82cc1ac7fdfbc4f62559 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_dump.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_dump.java
@@ -17,25 +17,26 @@ import com.oracle.truffle.r.test.TestBase;
 // Checkstyle: stop line length check
 public class TestBuiltin_dump extends TestBase {
 
-    private static final String TEMPLATE = "{ %s; .Internal(dump(%s, stdout(), environment(), .deparseOpts('all'), TRUE))}";
+    private static final String TEMPLATE = "{ %s; .Internal(dump(%s, stdout(), environment(), .deparseOpts(\"all\"), %s))}";
 
     @Test
     public void testDumpFunctions() {
-        assertEval(String.format(TEMPLATE, "fun <- function() print('Hello, World!')", "'fun'"));
-        assertEval(String.format(TEMPLATE, "foo <- function() cat('Hello'); bar <- function() cat('World')", "c('foo', 'bar')"));
+        assertEval(Output.IgnoreWhitespace, String.format(TEMPLATE, "fun <- function() print(\"Hello, World!\")", "\"fun\"", "TRUE"));
+        assertEval(Output.IgnoreWhitespace, String.format(TEMPLATE, "foo <- function() cat(\"Hello\"); bar <- function() cat(\"World\")", "c(\"foo\", \"bar\")", "TRUE"));
     }
 
     @Test
     public void testDumpData() {
-        assertEval(String.format(TEMPLATE, "x <- 10", "'x'"));
-        assertEval(String.format(TEMPLATE, "x <- list(a=10,b=20)", "'x'"));
-        assertEval(String.format(TEMPLATE, "x <- c(10,20,25)", "'x'"));
-        assertEval(String.format(TEMPLATE, "x <- 1:10", "'x'"));
+        assertEval(Output.IgnoreWhitespace, String.format(TEMPLATE, "x <- 10", "\"x\"", "TRUE"));
+        assertEval(Output.IgnoreWhitespace, String.format(TEMPLATE, "x <- list(a=10,b=20)", "\"x\"", "TRUE"));
+        assertEval(Output.IgnoreWhitespace, String.format(TEMPLATE, "x <- c(10,20,25)", "\"x\"", "TRUE"));
+        assertEval(Output.IgnoreWhitespace, String.format(TEMPLATE, "x <- 1:10", "\"x\"", "TRUE"));
     }
 
     @Test
     public void testDumpLanguage() {
-        assertEval(String.format(TEMPLATE, "x <- quote(2 + 3)", "'x'"));
+        assertEval(Output.IgnoreWhitespace, String.format(TEMPLATE, "x <- 2 + 3", "\"x\"", "FALSE"));
+        assertEval(Output.IgnoreWhitespace, String.format(TEMPLATE, "x <- quote(2 + 3)", "\"x\"", "FALSE"));
     }
 
 }