diff --git a/tests/opts/linalg-fold-unit-extent-dims/drop-unit-extent-dims.tgt.mlir b/tests/opts/linalg-fold-unit-extent-dims/drop-unit-extent-dims.tgt.mlir
index c7aeb549..05d2fbf5 100644
--- a/tests/opts/linalg-fold-unit-extent-dims/drop-unit-extent-dims.tgt.mlir
+++ b/tests/opts/linalg-fold-unit-extent-dims/drop-unit-extent-dims.tgt.mlir
@@ -10,7 +10,7 @@ module  {
       %5 = arith.addf %arg1, %arg2 : f32
       linalg.yield %5 : f32
     } -> tensor<1xf32>
-    %4 = tensor.expand_shape %3 [[0, 1]] : tensor<1xf32> into tensor<1x1xf32>
+    %4 = tensor.expand_shape %3 [[0, 1]] output_shape [1,1] : tensor<1xf32> into tensor<1x1xf32>
     return %4 : tensor<1x1xf32>
   }
 }
diff --git a/tests/opts/tosa-to-linalg/concat.src.mlir b/tests/opts/tosa-to-linalg/concat.src.mlir
index af8a4701..a9245231 100644
--- a/tests/opts/tosa-to-linalg/concat.src.mlir
+++ b/tests/opts/tosa-to-linalg/concat.src.mlir
@@ -1,7 +1,7 @@
 // VERIFY
 
 func.func @f(%t1: tensor<1x2xf32>, %t2: tensor<3x2xf32>, %t3: tensor<5x2xf32>) -> tensor<9x2xf32> {
-  %res = "tosa.concat"(%t1, %t2, %t3) { axis = 0 : i64}
+  %res = "tosa.concat"(%t1, %t2, %t3) { axis = 0 : i32}
     : (tensor<1x2xf32>, tensor<3x2xf32>, tensor<5x2xf32>) -> tensor<9x2xf32>
   return %res: tensor<9x2xf32>
 }
diff --git a/tests/opts/tosa-to-linalg/mul.src.mlir b/tests/opts/tosa-to-linalg/mul.src.mlir
index 253f65ba..51de8fdd 100644
--- a/tests/opts/tosa-to-linalg/mul.src.mlir
+++ b/tests/opts/tosa-to-linalg/mul.src.mlir
@@ -1,7 +1,7 @@
 // VERIFY
 
 func.func @f(%arg0: tensor<8xf32>, %arg1: tensor<8xf32>) -> tensor<8xf32> {
-  %0 = "tosa.mul"(%arg0, %arg1) {shift=0:i32}: (tensor<8xf32>, tensor<8xf32>) -> tensor<8xf32>
+  %0 = "tosa.mul"(%arg0, %arg1) {shift=0:i8}: (tensor<8xf32>, tensor<8xf32>) -> tensor<8xf32>
   return %0 : tensor<8xf32>
 }
 
diff --git a/tests/opts/tosa-to-linalg/muli.src.mlir b/tests/opts/tosa-to-linalg/muli.src.mlir
index dae4bcfa..ae2e285a 100644
--- a/tests/opts/tosa-to-linalg/muli.src.mlir
+++ b/tests/opts/tosa-to-linalg/muli.src.mlir
@@ -1,7 +1,7 @@
 // VERIFY
 
 func.func @f(%arg0: tensor<8xi32>, %arg1: tensor<8xi32>) -> tensor<8xi32> {
-  %0 = "tosa.mul"(%arg0, %arg1) {shift=0:i32}: (tensor<8xi32>, tensor<8xi32>) -> tensor<8xi32>
+  %0 = "tosa.mul"(%arg0, %arg1) {shift=0:i8}: (tensor<8xi32>, tensor<8xi32>) -> tensor<8xi32>
   return %0 : tensor<8xi32>
 }
 
diff --git a/tests/opts/tosa-to-linalg/reduce_sum.src.mlir b/tests/opts/tosa-to-linalg/reduce_sum.src.mlir
index fe3e3f95..a1256c42 100644
--- a/tests/opts/tosa-to-linalg/reduce_sum.src.mlir
+++ b/tests/opts/tosa-to-linalg/reduce_sum.src.mlir
@@ -5,6 +5,6 @@
 // a non-identity value (+0.0) to the output tensor.
 
 func.func @f(%t: tensor<3x4x5xf32>) -> tensor<1x4x5xf32> {
-  %0 = "tosa.reduce_sum"(%t) {axis = 0 : i64} : (tensor<3x4x5xf32>) -> tensor<1x4x5xf32>
+  %0 = "tosa.reduce_sum"(%t) {axis = 0 : i32} : (tensor<3x4x5xf32>) -> tensor<1x4x5xf32>
 	return %0: tensor<1x4x5xf32>
 }
diff --git a/tests/opts/tosa-to-linalg/reduce_sum2.src.mlir b/tests/opts/tosa-to-linalg/reduce_sum2.src.mlir
index fed8b9ae..f6d49478 100644
--- a/tests/opts/tosa-to-linalg/reduce_sum2.src.mlir
+++ b/tests/opts/tosa-to-linalg/reduce_sum2.src.mlir
@@ -5,6 +5,6 @@
 // a non-identity value (+0.0) to the output tensor.
 
 func.func @f(%t: tensor<3x4x5xf32>) -> tensor<3x1x5xf32> {
-  %0 = "tosa.reduce_sum"(%t) {axis = 1 : i64} : (tensor<3x4x5xf32>) -> tensor<3x1x5xf32>
+  %0 = "tosa.reduce_sum"(%t) {axis = 1 : i32} : (tensor<3x4x5xf32>) -> tensor<3x1x5xf32>
 	return %0: tensor<3x1x5xf32>
 }
diff --git a/tests/opts/tosa-to-linalg/reduce_sum3.src.mlir b/tests/opts/tosa-to-linalg/reduce_sum3.src.mlir
index 5cbb728f..82fcce48 100644
--- a/tests/opts/tosa-to-linalg/reduce_sum3.src.mlir
+++ b/tests/opts/tosa-to-linalg/reduce_sum3.src.mlir
@@ -5,6 +5,6 @@
 // a non-identity value (+0.0) to the output tensor.
 
 func.func @f(%t: tensor<3x1000x5xf32>) -> tensor<3x1x5xf32> {
-  %0 = "tosa.reduce_sum"(%t) {axis = 1 : i64} : (tensor<3x1000x5xf32>) -> tensor<3x1x5xf32>
+  %0 = "tosa.reduce_sum"(%t) {axis = 1 : i32} : (tensor<3x1000x5xf32>) -> tensor<3x1x5xf32>
 	return %0: tensor<3x1x5xf32>
 }
diff --git a/tests/opts/tosa-to-linalg/reverse.src.mlir b/tests/opts/tosa-to-linalg/reverse.src.mlir
index 625a7e47..c3fc592c 100644
--- a/tests/opts/tosa-to-linalg/reverse.src.mlir
+++ b/tests/opts/tosa-to-linalg/reverse.src.mlir
@@ -1,7 +1,7 @@
 // VERIFY
 
 func.func @f(%t: tensor<?x?x?xi32>) -> tensor<?x?x?xi32> {
-  %rt = "tosa.reverse"(%t) {axis = 1 : i64} : (tensor<?x?x?xi32>) -> tensor<?x?x?xi32>
+  %rt = "tosa.reverse"(%t) {axis = 1 : i32} : (tensor<?x?x?xi32>) -> tensor<?x?x?xi32>
   return %rt: tensor<?x?x?xi32>
 }