diff --git a/src/plugins/template/tests/functional/op_reference/bucketize.cpp b/src/plugins/template/tests/functional/op_reference/bucketize.cpp
index 487e20fa286..17fef885427 100644
--- a/src/plugins/template/tests/functional/op_reference/bucketize.cpp
+++ b/src/plugins/template/tests/functional/op_reference/bucketize.cpp
@@ -14,29 +14,29 @@ using namespace ov;
 struct BucketizeParams {
     template <class IT, class BT, class OT>
     BucketizeParams(const element::Type& input_type,
-                    const PartialShape& input_pshape,
+                    const Shape& input_shape,
                     const std::vector<IT>& input,
                     const element::Type& bucket_type,
-                    const PartialShape& bucket_pshape,
+                    const Shape& bucket_shape,
                     const std::vector<BT>& buckets,
                     bool with_right_bound,
                     const element::Type& output_type,
                     const std::vector<OT>& expected_output)
         : input_type(input_type),
-          input_pshape(input_pshape),
-          input(CreateTensor(input_type, input)),
+          input_shape(input_shape),
+          input(CreateTensor(input_shape, input_type, input)),
           bucket_type(bucket_type),
-          bucket_pshape(bucket_pshape),
-          buckets(CreateTensor(bucket_type, buckets)),
+          bucket_shape(bucket_shape),
+          buckets(CreateTensor(bucket_shape, bucket_type, buckets)),
           with_right_bound(with_right_bound),
           output_type(output_type),
-          expected_output(CreateTensor(output_type, expected_output)) {}
+          expected_output(CreateTensor(input_shape, output_type, expected_output)) {}
 
     element::Type input_type;
-    PartialShape input_pshape;
+    Shape input_shape;
     ov::Tensor input;
     element::Type bucket_type;
-    PartialShape bucket_pshape;
+    Shape bucket_shape;
     ov::Tensor buckets;
     bool with_right_bound;
     element::Type output_type;
@@ -46,12 +46,11 @@ struct BucketizeParams {
 class ReferenceBucketizeLayerTest : public testing::TestWithParam<BucketizeParams>, public CommonReferenceTest {
 public:
     void SetUp() override {
-        legacy_compare = true;
-        auto params = GetParam();
+        const auto& params = GetParam();
         function = CreateFunction(params.input_type,
-                                  params.input_pshape,
+                                  params.input_shape,
                                   params.bucket_type,
-                                  params.bucket_pshape,
+                                  params.bucket_shape,
                                   params.with_right_bound,
                                   params.output_type);
         inputData = {params.input, params.buckets};
@@ -59,12 +58,12 @@ public:
     }
 
     static std::string getTestCaseName(const testing::TestParamInfo<BucketizeParams>& obj) {
-        auto param = obj.param;
+        const auto& param = obj.param;
         std::ostringstream result;
         result << "input_type=" << param.input_type << "_";
-        result << "input_pshape=" << param.input_pshape << "_";
+        result << "input_shape=" << param.input_shape << "_";
         result << "bucket_type=" << param.bucket_type << "_";
-        result << "bucket_pshape=" << param.bucket_pshape << "_";
+        result << "bucket_shape=" << param.bucket_shape << "_";
         result << "with_right_bound=" << param.with_right_bound << "_";
         result << "output_type=" << param.output_type;
         return result.str();
@@ -72,13 +71,13 @@ public:
 
 private:
     static std::shared_ptr<Model> CreateFunction(const element::Type& input_type,
-                                                 const PartialShape& input_pshape,
+                                                 const Shape& input_shape,
                                                  const element::Type& bucket_type,
-                                                 const PartialShape& bucket_pshape,
+                                                 const Shape& bucket_shape,
                                                  const bool with_right_bound,
                                                  const element::Type& output_type) {
-        auto data = std::make_shared<op::v0::Parameter>(input_type, input_pshape);
-        auto buckets = std::make_shared<op::v0::Parameter>(bucket_type, bucket_pshape);
+        auto data = std::make_shared<op::v0::Parameter>(input_type, input_shape);
+        auto buckets = std::make_shared<op::v0::Parameter>(bucket_type, bucket_shape);
         return std::make_shared<Model>(
             std::make_shared<op::v3::Bucketize>(data, buckets, output_type, with_right_bound),
             ParameterVector{data, buckets});
@@ -94,20 +93,20 @@ INSTANTIATE_TEST_SUITE_P(smoke_Bucketize_With_Hardcoded_Refs,
                          ::testing::Values(
                              // fp32, int32, with_right_bound
                              BucketizeParams(element::f32,
-                                             PartialShape{10, 1},
+                                             Shape{10, 1},
                                              std::vector<float>{8.f, 1.f, 2.f, 1.1f, 8.f, 10.f, 1.f, 10.2f, 0.f, 20.f},
                                              element::i32,
-                                             PartialShape{4},
+                                             Shape{4},
                                              std::vector<int32_t>{1, 4, 10, 20},
                                              true,
                                              element::i32,
                                              std::vector<int32_t>{2, 0, 1, 1, 2, 2, 0, 3, 0, 3}),
                              // fp32, int32, with_right_bound
                              BucketizeParams(element::i32,
-                                             PartialShape{1, 1, 10},
+                                             Shape{1, 1, 10},
                                              std::vector<int32_t>{8, 1, 2, 1, 8, 5, 1, 5, 0, 20},
                                              element::i32,
-                                             PartialShape{4},
+                                             Shape{4},
                                              std::vector<int32_t>{1, 4, 10, 20},
                                              false,
                                              element::i32,