diff --git a/audio/aidl/vts/VtsHalEqualizerTargetTest.cpp b/audio/aidl/vts/VtsHalEqualizerTargetTest.cpp
index 1ac71f1..4162551 100644
--- a/audio/aidl/vts/VtsHalEqualizerTargetTest.cpp
+++ b/audio/aidl/vts/VtsHalEqualizerTargetTest.cpp
@@ -95,9 +95,9 @@
         CleanUp();
     }
 
-    const int mParamPresetIndex;
-    const int mParamBandIndex;
-    const int mParamBandLevel;
+    int mParamPresetIndex = 0;
+    int mParamBandIndex = 0;
+    int mParamBandLevel = 0;
 
     void SetAndGetEqualizerParameters() {
         auto functor = [&](const std::shared_ptr<IEffect>& effect) {
@@ -122,19 +122,54 @@
                 // only get if parameter in range and set success
                 if (expected == EX_NONE) {
                     Parameter getParam;
-                    Parameter::Specific::Id id;
-                    id.set<Parameter::Specific::Id::equalizerTag>(tag);
+                    Parameter::Id id;
+                    Equalizer::Id eqId;
+                    eqId.set<Equalizer::Id::commonTag>(tag);
+                    id.set<Parameter::Id::equalizerTag>(eqId);
                     // if set success, then get should match
                     EXPECT_STATUS(expected, effect->getParameter(id, &getParam));
-                    EXPECT_EQ(expectParam, getParam) << "\n"
-                                                     << expectParam.toString() << "\n"
-                                                     << getParam.toString();
+                    EXPECT_TRUE(isEqParameterExpected(expectParam, getParam));
                 }
             }
         };
         EXPECT_NO_FATAL_FAILURE(ForEachEffect(functor));
     }
 
+    bool isEqParameterExpected(const Parameter& expect, const Parameter& target) {
+        // if parameter same, then for sure matched
+        if (expect == target) return true;
+
+        // if not, see if target include the expect parameter, and others all default (0).
+        /*
+            This is verify the case of client setParameter to a single bandLevel ({3, -1} for
+           example), and return of getParameter must be [{0, 0}, {1, 0}, {2, 0}, {3, -1}, {4, 0}]
+        */
+        EXPECT_EQ(expect.getTag(), Parameter::specific);
+        EXPECT_EQ(target.getTag(), Parameter::specific);
+
+        Parameter::Specific expectSpec = expect.get<Parameter::specific>(),
+                            targetSpec = target.get<Parameter::specific>();
+        EXPECT_EQ(expectSpec.getTag(), Parameter::Specific::equalizer);
+        EXPECT_EQ(targetSpec.getTag(), Parameter::Specific::equalizer);
+
+        Equalizer expectEq = expectSpec.get<Parameter::Specific::equalizer>(),
+                  targetEq = targetSpec.get<Parameter::Specific::equalizer>();
+        EXPECT_EQ(expectEq.getTag(), targetEq.getTag());
+
+        auto eqTag = targetEq.getTag();
+        switch (eqTag) {
+            case Equalizer::bandLevels: {
+                auto expectBl = expectEq.get<Equalizer::bandLevels>();
+                auto targetBl = targetEq.get<Equalizer::bandLevels>();
+                return std::includes(targetBl.begin(), targetBl.end(), expectBl.begin(),
+                                     expectBl.end());
+            }
+            default:
+                return false;
+        }
+        return false;
+    }
+
     void addPresetParam(int preset) {
         Equalizer eq;
         eq.set<Equalizer::preset>(preset);
@@ -189,7 +224,6 @@
     }
 
   private:
-    Equalizer::VendorExtension mVendorExtension;
     std::vector<std::pair<Equalizer::Tag, std::unique_ptr<Equalizer>>> mTags;
 
     bool validCapabilityTag(Capability& cap) { return cap.getTag() == Capability::equalizer; }
@@ -211,8 +245,8 @@
 }
 
 TEST_P(EqualizerParamTest, SetAndGetSingleBand) {
-    Equalizer::BandLevel bandLevel = {mParamBandIndex, mParamBandLevel};
     std::vector<Equalizer::BandLevel> bandLevels;
+    Equalizer::BandLevel bandLevel = {mParamBandIndex, mParamBandLevel};
     bandLevels.push_back(bandLevel);
     EXPECT_NO_FATAL_FAILURE(addBandLevelsParam(bandLevels));
     SetAndGetEqualizerParameters();
