diff --git a/test/libsolidity/Assembly.cpp b/test/libsolidity/Assembly.cpp
index 4b599da68..2e7adeda2 100644
--- a/test/libsolidity/Assembly.cpp
+++ b/test/libsolidity/Assembly.cpp
@@ -158,6 +158,7 @@ BOOST_AUTO_TEST_SUITE(Assembly)
 BOOST_AUTO_TEST_CASE(location_test)
 {
 	auto sourceCode = make_shared<CharStream>(R"(
+	pragma abicoder v1;
 	contract test {
 		function f() public returns (uint256 a) {
 			return 16;
@@ -191,6 +192,7 @@ BOOST_AUTO_TEST_CASE(location_test)
 BOOST_AUTO_TEST_CASE(jump_type)
 {
 	auto sourceCode = make_shared<CharStream>(R"(
+	pragma abicoder v1;
 	contract C {
 		function f(uint a) public pure returns (uint t) {
 			assembly {
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_accessing_public_state_variable_via_v1_type.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_accessing_public_state_variable_via_v1_type.sol
index e88775901..f324d2c33 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_accessing_public_state_variable_via_v1_type.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_accessing_public_state_variable_via_v1_type.sol
@@ -1,3 +1,4 @@
+pragma abicoder v1;
 struct Item {
     uint x;
     uint y;
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_accessing_public_state_variable_via_v2_type.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_accessing_public_state_variable_via_v2_type.sol
index 326101a37..feaf895e1 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_accessing_public_state_variable_via_v2_type.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_accessing_public_state_variable_via_v2_type.sol
@@ -1,3 +1,4 @@
+pragma abicoder v1;
 struct Item {
     uint x;
     uint y;
@@ -13,5 +14,5 @@ contract D {
     }
 }
 // ----
-// TypeError 7364: (202-240): Different number of components on the left hand side (1) than on the right hand side (2).
-// TypeError 9574: (202-240): Type uint256 is not implicitly convertible to expected type struct Item memory.
+// TypeError 7364: (222-260): Different number of components on the left hand side (1) than on the right hand side (2).
+// TypeError 9574: (222-260): Type uint256 is not implicitly convertible to expected type struct Item memory.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v1_library_function_accepting_storage_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v1_library_function_accepting_storage_struct.sol
index 231ab66e0..b21b7cfaf 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v1_library_function_accepting_storage_struct.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v1_library_function_accepting_storage_struct.sol
@@ -9,6 +9,7 @@ library L {
     function set(Item storage _item) external view {}
 }
 ==== Source: B ====
+pragma abicoder v1;
 import "A";
 
 contract Test {
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_constructor_accepting_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_constructor_accepting_struct.sol
index 0005e3bbb..8ba00da1a 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_constructor_accepting_struct.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_constructor_accepting_struct.sol
@@ -9,6 +9,7 @@ contract C {
     constructor(Item memory _item) {}
 }
 ==== Source: B ====
+pragma abicoder v1;
 import "A";
 
 contract Test {
@@ -17,4 +18,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 2443: (B:71-80): The type of this parameter, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2443: (B:91-100): The type of this parameter, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_accepting_struct_via_named_argument.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_accepting_struct_via_named_argument.sol
index 987c3ae0e..417f5682f 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_accepting_struct_via_named_argument.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_accepting_struct_via_named_argument.sol
@@ -9,6 +9,7 @@ contract C {
     function set(uint _x, string memory _y, Item memory _item, bool _z) external view {}
 }
 ==== Source: B ====
+pragma abicoder v1;
 import "A";
 
 contract Test {
@@ -17,4 +18,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 2443: (B:99-109): The type of this parameter, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2443: (B:119-129): The type of this parameter, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_pointer_accepting_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_pointer_accepting_struct.sol
index 8fb8b9ed8..1b08439cc 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_pointer_accepting_struct.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_pointer_accepting_struct.sol
@@ -9,6 +9,7 @@ contract C {
     function get(Item memory _item) external {}
 }
 ==== Source: B ====
+pragma abicoder v1;
 import "A";
 
 contract Test {
@@ -19,4 +20,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 2443: (B:146-155): The type of this parameter, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2443: (B:166-175): The type of this parameter, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_dynamic_string_array.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_dynamic_string_array.sol
index 304cb1fb0..baadf362e 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_dynamic_string_array.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_dynamic_string_array.sol
@@ -5,6 +5,7 @@ contract C {
     function f() external view returns (string[] memory) {}
 }
 ==== Source: B ====
+pragma abicoder v1;
 import "A";
 
 contract D {
@@ -13,4 +14,4 @@ contract D {
     }
 }
 // ----
-// TypeError 2428: (B:65-85): The type of return parameter 1, string[], is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2428: (B:85-105): The type of return parameter 1, string[], is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_struct.sol
index 27619f62f..f84a13d49 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_struct.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_struct.sol
@@ -9,6 +9,7 @@ contract C {
     function get() external view returns(Item memory) {}
 }
 ==== Source: B ====
+pragma abicoder v1;
 import "A";
 
 contract Test {
@@ -17,4 +18,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 2428: (B:70-92): The type of return parameter 1, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2428: (B:90-112): The type of return parameter 1, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_struct_with_dynamic_array.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_struct_with_dynamic_array.sol
index d44431993..a67394e0e 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_struct_with_dynamic_array.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_struct_with_dynamic_array.sol
@@ -9,6 +9,7 @@ contract C {
     function get() external view returns(Item memory) {}
 }
 ==== Source: B ====
+pragma abicoder v1;
 import "A";
 
 contract Test {
@@ -17,4 +18,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 2428: (B:70-92): The type of return parameter 1, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2428: (B:90-112): The type of return parameter 1, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_event_accepting_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_event_accepting_struct.sol
index 4ba439035..1269a29ee 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_event_accepting_struct.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_event_accepting_struct.sol
@@ -8,6 +8,7 @@ library L {
     event E(Item _value);
 }
 ==== Source: B ====
+pragma abicoder v1;
 import "A";
 
 contract Test {
@@ -16,4 +17,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 2443: (B:74-84): The type of this parameter, struct L.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2443: (B:94-104): The type of this parameter, struct L.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_bound_function_returning_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_bound_function_returning_struct.sol
index 901a02328..149aefa96 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_bound_function_returning_struct.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_bound_function_returning_struct.sol
@@ -9,6 +9,7 @@ library L {
     function f(uint) external view returns (Item memory) {}
 }
 ==== Source: B ====
+pragma abicoder v1;
 import "A";
 
 contract D {
@@ -19,4 +20,4 @@ contract D {
     }
 }
 // ----
-// TypeError 2428: (B:86-97): The type of return parameter 1, struct L.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2428: (B:106-117): The type of return parameter 1, struct L.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_function_accepting_storage_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_function_accepting_storage_struct.sol
index 238905863..41bc072a5 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_function_accepting_storage_struct.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_function_accepting_storage_struct.sol
@@ -9,6 +9,7 @@ library L {
     function get(Item storage _item) external view {}
 }
 ==== Source: B ====
+pragma abicoder v1;
 import "A";
 
 contract Test {
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_function_returning_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_function_returning_struct.sol
index 71f64d84f..b3d649e2c 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_function_returning_struct.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_function_returning_struct.sol
@@ -9,6 +9,7 @@ library L {
     function get() external view returns(Item memory) {}
 }
 ==== Source: B ====
+pragma abicoder v1;
 import "A";
 
 contract Test {
@@ -17,4 +18,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 2428: (B:70-77): The type of return parameter 1, struct L.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2428: (B:90-97): The type of return parameter 1, struct L.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_modifier.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_modifier.sol
index d7d3d3b57..78d7b0512 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_modifier.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_modifier.sol
@@ -16,6 +16,7 @@ contract B {
     }
 }
 ==== Source: B ====
+pragma abicoder v1;
 import "A";
 
 contract C is B {
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_constructor_with_v2_modifier.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_constructor_with_v2_modifier.sol
index 648141a6c..1ac5d713b 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_constructor_with_v2_modifier.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_constructor_with_v2_modifier.sol
@@ -21,10 +21,12 @@ contract B {
 }
 
 ==== Source: B ====
+pragma abicoder v1;
 import "A";
 
 contract C is B {}
 ==== Source: C ====
+pragma abicoder v1;
 import "B";
 
 contract D is C {
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_calling_v2_function.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_calling_v2_function.sol
index 3548451ac..073a125be 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_calling_v2_function.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_calling_v2_function.sol
@@ -19,6 +19,7 @@ contract B {
     }
 }
 ==== Source: B ====
+pragma abicoder v1;
 import "A";
 
 contract C is B {}
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_defining_v2_event.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_defining_v2_event.sol
index fa0ab0a3d..963ed33c7 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_defining_v2_event.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_defining_v2_event.sol
@@ -9,6 +9,7 @@ contract C {
     event Ev(Item);
 }
 ==== Source: B ====
+pragma abicoder v1;
 import "A";
 
 contract D is C {}
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_defining_v2_function_accepting_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_defining_v2_function_accepting_struct.sol
index 4657a431f..c37bad41c 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_defining_v2_function_accepting_struct.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_defining_v2_function_accepting_struct.sol
@@ -9,8 +9,9 @@ contract C {
     function get(Item memory) external view {}
 }
 ==== Source: B ====
+pragma abicoder v1;
 import "A";
 
 contract D is C {}
 // ----
-// TypeError 6594: (B:13-31): Contract "D" does not use ABI coder v2 but wants to inherit from a contract which uses types that require it. Use "pragma abicoder v2;" for the inheriting contract as well to enable the feature.
+// TypeError 6594: (B:33-51): Contract "D" does not use ABI coder v2 but wants to inherit from a contract which uses types that require it. Use "pragma abicoder v2;" for the inheriting contract as well to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_defining_v2_function_returning_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_defining_v2_function_returning_struct.sol
index 9b687a030..f25754246 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_defining_v2_function_returning_struct.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_defining_v2_function_returning_struct.sol
@@ -9,8 +9,9 @@ contract C {
     function get() external view returns(Item memory) {}
 }
 ==== Source: B ====
+pragma abicoder v1;
 import "A";
 
 contract D is C {}
 // ----
-// TypeError 6594: (B:13-31): Contract "D" does not use ABI coder v2 but wants to inherit from a contract which uses types that require it. Use "pragma abicoder v2;" for the inheriting contract as well to enable the feature.
+// TypeError 6594: (B:33-51): Contract "D" does not use ABI coder v2 but wants to inherit from a contract which uses types that require it. Use "pragma abicoder v2;" for the inheriting contract as well to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_emitting_v2_event.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_emitting_v2_event.sol
index 2dc8e4b58..8aa2f8552 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_emitting_v2_event.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_emitting_v2_event.sol
@@ -15,6 +15,7 @@ contract C {
     }
 }
 ==== Source: B ====
+pragma abicoder v1;
 import "A";
 
 contract D is C {}
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_modifier_overriding_v2_modifier.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_modifier_overriding_v2_modifier.sol
index d29971f7c..dd102cf51 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_modifier_overriding_v2_modifier.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_modifier_overriding_v2_modifier.sol
@@ -17,6 +17,7 @@ contract B {
 }
 
 ==== Source: B ====
+pragma abicoder v1;
 import "A";
 
 contract C is B {
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_v2_v1_modifier_mix.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_v2_v1_modifier_mix.sol
index 61ddd47b5..e5df9cc82 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_v2_v1_modifier_mix.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_v2_v1_modifier_mix.sol
@@ -1,4 +1,5 @@
 ==== Source: C ====
+pragma abicoder v1;
 import "X";
 import "V1A";
 import "V2A";
@@ -14,6 +15,7 @@ contract C is V1A, V2A, V1B {
     }
 }
 ==== Source: V1A ====
+pragma abicoder v1;
 import "X";
 
 contract V1A {
@@ -22,6 +24,7 @@ contract V1A {
     }
 }
 ==== Source: V1B ====
+pragma abicoder v1;
 import "X";
 
 contract V1B {
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v2_v1_v1_modifier_sandwich.sol b/test/libsolidity/syntaxTests/abiEncoder/v2_v1_v1_modifier_sandwich.sol
index 5c4c70699..d7373ef7b 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v2_v1_v1_modifier_sandwich.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v2_v1_v1_modifier_sandwich.sol
@@ -9,6 +9,7 @@ contract A {
     function get() public view returns (Data memory) {}
 }
 ==== Source: B ====
+pragma abicoder v1;
 import "A";
 
 contract B {
@@ -18,6 +19,7 @@ contract B {
     }
 }
 ==== Source: C ====
+pragma abicoder v1;
 import "B";
 
 contract C is B {
@@ -27,4 +29,4 @@ contract C is B {
     {}
 }
 // ----
-// TypeError 2428: (B:60-82): The type of return parameter 1, struct Data, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2428: (B:80-102): The type of return parameter 1, struct Data, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v2_v1_v2_modifier_sandwich.sol b/test/libsolidity/syntaxTests/abiEncoder/v2_v1_v2_modifier_sandwich.sol
index 20b4627f6..c3bf2c430 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v2_v1_v2_modifier_sandwich.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v2_v1_v2_modifier_sandwich.sol
@@ -9,6 +9,7 @@ contract A {
     function get() public view returns (Data memory) {}
 }
 ==== Source: B ====
+pragma abicoder v1;
 import "A";
 
 contract B {
@@ -29,4 +30,4 @@ contract C is B {
     {}
 }
 // ----
-// TypeError 2428: (B:60-82): The type of return parameter 1, struct Data, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2428: (B:80-102): The type of return parameter 1, struct Data, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/array/calldata_multi_dynamic_V1.sol b/test/libsolidity/syntaxTests/array/calldata_multi_dynamic_V1.sol
index 00bd4208c..754270ecf 100644
--- a/test/libsolidity/syntaxTests/array/calldata_multi_dynamic_V1.sol
+++ b/test/libsolidity/syntaxTests/array/calldata_multi_dynamic_V1.sol
@@ -1,7 +1,8 @@
+pragma abicoder v1;
 contract Test {
     function f(uint[][] calldata) external { }
     function g(uint[][1] calldata) external { }
 }
 // ----
-// TypeError 4957: (31-48): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
-// TypeError 4957: (78-96): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 4957: (51-68): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 4957: (98-116): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/constructor/nonabiv2_type.sol b/test/libsolidity/syntaxTests/constructor/nonabiv2_type.sol
index 3487c67f3..8e0c323b8 100644
--- a/test/libsolidity/syntaxTests/constructor/nonabiv2_type.sol
+++ b/test/libsolidity/syntaxTests/constructor/nonabiv2_type.sol
@@ -1,5 +1,6 @@
+pragma abicoder v1;
 contract C {
 	constructor(uint[][][] memory t) {}
 }
 // ----
-// TypeError 4957: (26-45): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature. Alternatively, make the contract abstract and supply the constructor arguments from a derived contract.
+// TypeError 4957: (46-65): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature. Alternatively, make the contract abstract and supply the constructor arguments from a derived contract.
diff --git a/test/libsolidity/syntaxTests/constructor/nonabiv2_type_abstract.sol b/test/libsolidity/syntaxTests/constructor/nonabiv2_type_abstract.sol
index 7fc802247..2ca22790c 100644
--- a/test/libsolidity/syntaxTests/constructor/nonabiv2_type_abstract.sol
+++ b/test/libsolidity/syntaxTests/constructor/nonabiv2_type_abstract.sol
@@ -1,3 +1,4 @@
+pragma abicoder v1;
 abstract contract C {
 	constructor(uint[][][] memory t) {}
 }
diff --git a/test/libsolidity/syntaxTests/events/event_nested_array.sol b/test/libsolidity/syntaxTests/events/event_nested_array.sol
index 09ae580f6..2491dae6e 100644
--- a/test/libsolidity/syntaxTests/events/event_nested_array.sol
+++ b/test/libsolidity/syntaxTests/events/event_nested_array.sol
@@ -1,5 +1,6 @@
+pragma abicoder v1;
 contract c {
     event E(uint[][]);
 }
 // ----
-// TypeError 3061: (25-33): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 3061: (45-53): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/events/event_nested_array_in_struct.sol b/test/libsolidity/syntaxTests/events/event_nested_array_in_struct.sol
index b06f4990f..ee868a715 100644
--- a/test/libsolidity/syntaxTests/events/event_nested_array_in_struct.sol
+++ b/test/libsolidity/syntaxTests/events/event_nested_array_in_struct.sol
@@ -1,6 +1,7 @@
+pragma abicoder v1;
 contract c {
 	struct S { uint x; uint[][] arr; }
     event E(S);
 }
 // ----
-// TypeError 3061: (61-62): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 3061: (81-82): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/events/event_struct.sol b/test/libsolidity/syntaxTests/events/event_struct.sol
index fad75f5a5..ac6355fe0 100644
--- a/test/libsolidity/syntaxTests/events/event_struct.sol
+++ b/test/libsolidity/syntaxTests/events/event_struct.sol
@@ -1,6 +1,7 @@
+pragma abicoder v1;
 contract c {
     struct S { uint a ; }
     event E(S);
 }
 // ----
-// TypeError 3061: (51-52): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 3061: (71-72): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/events/event_struct_indexed.sol b/test/libsolidity/syntaxTests/events/event_struct_indexed.sol
index 1425ca9b9..7e3393400 100644
--- a/test/libsolidity/syntaxTests/events/event_struct_indexed.sol
+++ b/test/libsolidity/syntaxTests/events/event_struct_indexed.sol
@@ -1,6 +1,7 @@
+pragma abicoder v1;
 contract c {
     struct S { uint a ; }
     event E(S indexed);
 }
 // ----
-// TypeError 3061: (51-60): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 3061: (71-80): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/getter/nested_structs.sol b/test/libsolidity/syntaxTests/getter/nested_structs.sol
index 6e901b438..36886bacf 100644
--- a/test/libsolidity/syntaxTests/getter/nested_structs.sol
+++ b/test/libsolidity/syntaxTests/getter/nested_structs.sol
@@ -1,3 +1,4 @@
+pragma abicoder v1;
 contract C {
     struct Y {
         uint b;
@@ -8,4 +9,4 @@ contract C {
     mapping(uint256 => X) public m;
 }
 // ----
-// TypeError 2763: (88-118): The following types are only supported for getters in ABI coder v2: struct C.Y memory. Either remove "public" or use "pragma abicoder v2;" to enable the feature.
+// TypeError 2763: (108-138): The following types are only supported for getters in ABI coder v2: struct C.Y memory. Either remove "public" or use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/imports/inheritance_abi_encoder_mismatch_1.sol b/test/libsolidity/syntaxTests/imports/inheritance_abi_encoder_mismatch_1.sol
index 9e1761284..891f57e8d 100644
--- a/test/libsolidity/syntaxTests/imports/inheritance_abi_encoder_mismatch_1.sol
+++ b/test/libsolidity/syntaxTests/imports/inheritance_abi_encoder_mismatch_1.sol
@@ -13,7 +13,8 @@ pragma abicoder               v2;
 import "./A.sol";
 contract B is A { }
 ==== Source: C.sol ====
+pragma abicoder v1;
 import "./B.sol";
 contract C is B { }
 // ----
-// TypeError 6594: (C.sol:18-37): Contract "C" does not use ABI coder v2 but wants to inherit from a contract which uses types that require it. Use "pragma abicoder v2;" for the inheriting contract as well to enable the feature.
+// TypeError 6594: (C.sol:38-57): Contract "C" does not use ABI coder v2 but wants to inherit from a contract which uses types that require it. Use "pragma abicoder v2;" for the inheriting contract as well to enable the feature.
diff --git a/test/libsolidity/syntaxTests/imports/inheritance_abi_encoder_mismatch_2.sol b/test/libsolidity/syntaxTests/imports/inheritance_abi_encoder_mismatch_2.sol
index b4cd6c6c4..c92221f3a 100644
--- a/test/libsolidity/syntaxTests/imports/inheritance_abi_encoder_mismatch_2.sol
+++ b/test/libsolidity/syntaxTests/imports/inheritance_abi_encoder_mismatch_2.sol
@@ -8,10 +8,12 @@ contract A
     function f(S memory _s) public returns (S memory,S memory) { }
 }
 ==== Source: B.sol ====
+pragma abicoder v1;
 import "./A.sol";
 contract B is A { }
 ==== Source: C.sol ====
+pragma abicoder v1;
 import "./B.sol";
 contract C is B { }
 // ----
-// TypeError 6594: (B.sol:18-37): Contract "B" does not use ABI coder v2 but wants to inherit from a contract which uses types that require it. Use "pragma abicoder v2;" for the inheriting contract as well to enable the feature.
+// TypeError 6594: (B.sol:38-57): Contract "B" does not use ABI coder v2 but wants to inherit from a contract which uses types that require it. Use "pragma abicoder v2;" for the inheriting contract as well to enable the feature.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/045_returning_multi_dimensional_arrays.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/045_returning_multi_dimensional_arrays.sol
index a0a2e0408..c9075a4cd 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/045_returning_multi_dimensional_arrays.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/045_returning_multi_dimensional_arrays.sol
@@ -1,5 +1,6 @@
+pragma abicoder v1;
 contract C {
     function f() public pure returns (string[][] memory) {}
 }
 // ----
-// TypeError 4957: (51-68): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 4957: (71-88): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/046_returning_multi_dimensional_static_arrays.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/046_returning_multi_dimensional_static_arrays.sol
index a643aec01..ee8c7f18d 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/046_returning_multi_dimensional_static_arrays.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/046_returning_multi_dimensional_static_arrays.sol
@@ -1,5 +1,6 @@
+pragma abicoder v1;
 contract C {
     function f() public pure returns (uint[][2] memory) {}
 }
 // ----
-// TypeError 4957: (51-67): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 4957: (71-87): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/048_returning_arrays_in_structs_arrays.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/048_returning_arrays_in_structs_arrays.sol
index 46e495217..77c77831e 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/048_returning_arrays_in_structs_arrays.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/048_returning_arrays_in_structs_arrays.sol
@@ -1,6 +1,7 @@
+pragma abicoder v1;
 contract C {
     struct S { string[] s; }
     function f() public pure returns (S memory x) {}
 }
 // ----
-// TypeError 4957: (80-90): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 4957: (100-110): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/585_abi_decode_with_unsupported_types.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/585_abi_decode_with_unsupported_types.sol
index a2ec34ecf..abbf76182 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/585_abi_decode_with_unsupported_types.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/585_abi_decode_with_unsupported_types.sol
@@ -1,3 +1,4 @@
+pragma abicoder v1;
 contract C {
 	struct s { uint a; uint b; }
     function f() pure public {
@@ -5,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9611: (98-99): Decoding type struct C.s memory not supported.
+// TypeError 9611: (118-119): Decoding type struct C.s memory not supported.
diff --git a/test/libsolidity/syntaxTests/parsing/declaring_fixed_and_ufixed_variables.sol b/test/libsolidity/syntaxTests/parsing/declaring_fixed_and_ufixed_variables.sol
index 230176df7..e34522540 100644
--- a/test/libsolidity/syntaxTests/parsing/declaring_fixed_and_ufixed_variables.sol
+++ b/test/libsolidity/syntaxTests/parsing/declaring_fixed_and_ufixed_variables.sol
@@ -6,7 +6,7 @@ contract A {
     }
 }
 // ----
-// UnimplementedFeatureError: Not yet implemented - FixedPointType.
+// UnimplementedFeatureError: Fixed point types not implemented.
 // Warning 5667: (52-60): Unused function parameter. Remove or comment out the variable name to silence this warning.
 // Warning 5667: (62-74): Unused function parameter. Remove or comment out the variable name to silence this warning.
 // Warning 2072: (93-104): Unused local variable.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_nested_dynamic_array.sol b/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_nested_dynamic_array.sol
index 3645cf592..c10dc10f2 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_nested_dynamic_array.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_nested_dynamic_array.sol
@@ -1,7 +1,8 @@
+pragma abicoder v1;
 contract C {
     function f() public pure {
         abi.encodePacked([new uint[](5), new uint[](7)]);
     }
 }
 // ----
-// TypeError 9578: (69-99): Type not supported in packed mode.
+// TypeError 9578: (89-119): Type not supported in packed mode.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abi_encode_nested_dynamic_array.sol b/test/libsolidity/syntaxTests/specialFunctions/abi_encode_nested_dynamic_array.sol
index e4e5a85dc..8c679258c 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/abi_encode_nested_dynamic_array.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/abi_encode_nested_dynamic_array.sol
@@ -1,7 +1,8 @@
+pragma abicoder v1;
 contract C {
     function test() public pure {
         abi.encode([new uint[](5), new uint[](7)]);
     }
 }
 // ----
-// TypeError 2056: (66-96): This type cannot be encoded.
+// TypeError 2056: (86-116): This type cannot be encoded.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abi_encode_structs.sol b/test/libsolidity/syntaxTests/specialFunctions/abi_encode_structs.sol
index e502f1e13..a7d0e3dbe 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/abi_encode_structs.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/abi_encode_structs.sol
@@ -1,3 +1,4 @@
+pragma abicoder v1;
 contract C {
     struct S { uint x; }
     S s;
@@ -11,7 +12,7 @@ contract C {
     }
 }
 // ----
-// TypeError 2056: (131-132): This type cannot be encoded.
-// TypeError 2056: (134-135): This type cannot be encoded.
-// TypeError 9578: (200-201): Type not supported in packed mode.
-// TypeError 9578: (203-204): Type not supported in packed mode.
+// TypeError 2056: (151-152): This type cannot be encoded.
+// TypeError 2056: (154-155): This type cannot be encoded.
+// TypeError 9578: (220-221): Type not supported in packed mode.
+// TypeError 9578: (223-224): Type not supported in packed mode.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_nested_dynamic_array.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_nested_dynamic_array.sol
index d1820aab1..c705ab2ec 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_nested_dynamic_array.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_nested_dynamic_array.sol
@@ -1,7 +1,8 @@
+pragma abicoder v1;
 contract C {
     function f() public pure {
         abi.decode("1234", (uint[][3]));
     }
 }
 // ----
-// TypeError 9611: (72-81): Decoding type uint256[] memory[3] memory not supported.
+// TypeError 9611: (92-101): Decoding type uint256[] memory[3] memory not supported.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_struct.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_struct.sol
index b8b49ccdb..dd981b54c 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_struct.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_struct.sol
@@ -1,3 +1,4 @@
+pragma abicoder v1;
 struct S {
     uint x;
 }
@@ -8,4 +9,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9611: (98-99): Decoding type struct S memory not supported.
+// TypeError 9611: (118-119): Decoding type struct S memory not supported.