test/base/test.ml                    |  6 +++---

 test/driver/exception_handling/run.t | 10 +++++-----

 test/expansion_context/run.t         | 10 +++++-----

 test/ppx_import_support/test.ml      |  4 ++--

 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/test/base/test.ml b/test/base/test.ml

index 7cf282a..77c27e5 100644

--- a/test/base/test.ml

+++ b/test/base/test.ml

@@ -106,17 +106,17 @@ let _ = convert_longident "Base.( land )"

 let _ = convert_longident "A(B)"

 [%%expect{|

-Exception: (Invalid_argument "Ppxlib.Longident.parse: \"A(B)\"")

+Exception: Invalid_argument "Ppxlib.Longident.parse: \"A(B)\"".

 |}]

 let _ = convert_longident "A.B(C)"

 [%%expect{|

-Exception: (Invalid_argument "Ppxlib.Longident.parse: \"A.B(C)\"")

+Exception: Invalid_argument "Ppxlib.Longident.parse: \"A.B(C)\"".

 |}]

 let _ = convert_longident ")"

 [%%expect{|

-Exception: (Invalid_argument "Ppxlib.Longident.parse: \")\"")

+Exception: Invalid_argument "Ppxlib.Longident.parse: \")\"".

 |}]

 let _ = Ppxlib.Code_path.(file_path @@ top_level ~file_path:"dir/main.ml")

diff --git a/test/driver/exception_handling/run.t b/test/driver/exception_handling/run.t

index ad3f217..48553ab 100644

--- a/test/driver/exception_handling/run.t

+++ b/test/driver/exception_handling/run.t

@@ -99,10 +99,10 @@ can be reported about it.

   $ echo "let _ = [%gen_raise_exc] + [%gen_raise_exc]" > impl.ml

   $ ./extender.exe impl.ml

-  Fatal error: exception (Failure "A raised exception")

+  Fatal error: exception Failure("A raised exception")

   [2]

   $ ./extender.exe -embed-errors impl.ml

-  Fatal error: exception (Failure "A raised exception")

+  Fatal error: exception Failure("A raised exception")

   [2]

  In the case of derivers

@@ -110,14 +110,14 @@ can be reported about it.

   $ echo "type a = int" > impl.ml

   $ echo "type b = int [@@deriving deriver_raised_exception]" >> impl.ml

   $ ./deriver.exe -embed-errors impl.ml

-  Fatal error: exception (Failure "A raised exception")

+  Fatal error: exception Failure("A raised exception")

   [2]

  In the case of whole file transformations:

   $ ./whole_file_exception.exe impl.ml

-  Fatal error: exception (Failure "An exception in a whole file transform")

+  Fatal error: exception Failure("An exception in a whole file transform")

   [2]

   $ ./whole_file_exception.exe -embed-errors impl.ml

-  Fatal error: exception (Failure "An exception in a whole file transform")

+  Fatal error: exception Failure("An exception in a whole file transform")

   [2]

diff --git a/test/expansion_context/run.t b/test/expansion_context/run.t

index fe0da0b..f73852e 100644

--- a/test/expansion_context/run.t

+++ b/test/expansion_context/run.t

@@ -1,7 +1,7 @@

 The three context fields can be accessed in a rewriter, both from within an implementation file

   $ echo "let x = 0" > file.ml

-  $ ./standalone_print_ctxt.exe file.ml | egrep 'tool_name|input_name|file_path'

+  $ ./standalone_print_ctxt.exe file.ml | grep -E 'tool_name|input_name|file_path'

   tool_name: ppx_driver

   input_name: file.ml

   file_path: file.ml

@@ -9,7 +9,7 @@ The three context fields can be accessed in a rewriter, both from within an impl

 and from within an interface file

   $ echo "val x : int" > file.mli

-  $ ./standalone_print_ctxt.exe file.mli | egrep 'tool_name|input_name|file_path'

+  $ ./standalone_print_ctxt.exe file.mli | grep -E 'tool_name|input_name|file_path'

   tool_name: ppx_driver

   input_name: file.mli

   file_path: file.mli

@@ -18,7 +18,7 @@ In most cases, the input name and the file path coincide. But there are some exc

 1. empty files

   $ touch empty_file.ml

-  $ ./standalone_print_ctxt.exe empty_file.ml | egrep 'input_name|file_path'

+  $ ./standalone_print_ctxt.exe empty_file.ml | grep -E 'input_name|file_path'

   input_name: empty_file.ml

   file_path: 

@@ -28,12 +28,12 @@ In most cases, the input name and the file path coincide. But there are some exc

   > # 1 "file.ml"

   > let y = 0

   > EOF

-  $ ./standalone_print_ctxt.exe directive.ml | egrep 'input_name|file_path'

+  $ ./standalone_print_ctxt.exe directive.ml | grep -E 'input_name|file_path'

   input_name: directive.ml

   file_path: file.ml

 3. using `map_structure` (or `map_signature`)

-  $ echo "let x = 0" | ./map_structure_print_ctxt.exe | egrep 'input_name|file_path'

+  $ echo "let x = 0" | ./map_structure_print_ctxt.exe | grep -E 'input_name|file_path'

   input_name: _none_

   file_path: lexbuf_pos_fname

diff --git a/test/ppx_import_support/test.ml b/test/ppx_import_support/test.ml

index e32d39b..66fd12b 100644

--- a/test/ppx_import_support/test.ml

+++ b/test/ppx_import_support/test.ml

@@ -108,6 +108,6 @@ let id_for_core_types =

     (fun ~ctxt:_ core_type -> core_type)

 [%%expect{|

 Exception:

-(Failure

-  "Some ppx-es tried to register conflicting transformations: Extension 'id' on type declarations matches extension 'id'")

+Failure

+ "Some ppx-es tried to register conflicting transformations: Extension 'id' on type declarations matches extension 'id'".

 |}]