diff --git a/src/components/checkbox/checkbox.test.ts b/src/components/checkbox/checkbox.test.ts
index cfdfbb6ac..4ef27ae5d 100644
--- a/src/components/checkbox/checkbox.test.ts
+++ b/src/components/checkbox/checkbox.test.ts
@@ -199,17 +199,17 @@ describe('<wa-checkbox>', () => {
 
           expect(checkbox.checkValidity()).to.be.false;
           expect(checkbox.checkValidity()).to.be.false;
-          expect(checkbox.hasAttribute('data-wa-invalid')).to.be.true;
-          expect(checkbox.hasAttribute('data-wa-valid')).to.be.false;
-          expect(checkbox.hasAttribute('data-wa-user-invalid')).to.be.true;
-          expect(checkbox.hasAttribute('data-wa-user-valid')).to.be.false;
+          expect(checkbox.hasCustomState('invalid')).to.be.true;
+          expect(checkbox.hasCustomState('valid')).to.be.false;
+          expect(checkbox.hasCustomState('user-invalid')).to.be.true;
+          expect(checkbox.hasCustomState('user-valid')).to.be.false;
 
           await clickOnElement(checkbox);
           await checkbox.updateComplete;
           await aTimeout(0);
 
-          expect(checkbox.hasAttribute('data-wa-user-invalid')).to.be.true;
-          expect(checkbox.hasAttribute('data-wa-user-valid')).to.be.false;
+          expect(checkbox.hasCustomState('user-invalid')).to.be.true;
+          expect(checkbox.hasCustomState('user-valid')).to.be.false;
         });
 
         it('should be invalid when required and unchecked', async () => {
diff --git a/src/components/range/range.test.ts b/src/components/range/range.test.ts
index 70f011788..a948c0f17 100644
--- a/src/components/range/range.test.ts
+++ b/src/components/range/range.test.ts
@@ -164,18 +164,18 @@ describe('<wa-range>', () => {
           await range.updateComplete;
 
           expect(range.checkValidity()).to.be.false;
-          expect(range.hasAttribute('data-wa-invalid')).to.be.true;
-          expect(range.hasAttribute('data-wa-valid')).to.be.false;
-          expect(range.hasAttribute('data-wa-user-invalid')).to.be.false;
-          expect(range.hasAttribute('data-wa-user-valid')).to.be.false;
+          expect(range.hasCustomState('invalid')).to.be.true;
+          expect(range.hasCustomState('valid')).to.be.false;
+          expect(range.hasCustomState('user-invalid')).to.be.false;
+          expect(range.hasCustomState('user-valid')).to.be.false;
 
           await clickOnElement(range);
           await range.updateComplete;
           range.blur();
           await range.updateComplete;
 
-          expect(range.hasAttribute('data-wa-user-invalid')).to.be.true;
-          expect(range.hasAttribute('data-wa-user-valid')).to.be.false;
+          expect(range.hasCustomState('user-invalid')).to.be.true;
+          expect(range.hasCustomState('user-valid')).to.be.false;
         });
 
         it('should receive validation attributes ("states") even when novalidate is used on the parent form', async () => {
@@ -185,10 +185,10 @@ describe('<wa-range>', () => {
           range.setCustomValidity('Invalid value');
           await range.updateComplete;
 
-          expect(range.hasAttribute('data-wa-invalid')).to.be.true;
-          expect(range.hasAttribute('data-wa-valid')).to.be.false;
-          expect(range.hasAttribute('data-wa-user-invalid')).to.be.false;
-          expect(range.hasAttribute('data-wa-user-valid')).to.be.false;
+          expect(range.hasCustomState('invalid')).to.be.true;
+          expect(range.hasCustomState('valid')).to.be.false;
+          expect(range.hasCustomState('user-invalid')).to.be.false;
+          expect(range.hasCustomState('user-valid')).to.be.false;
         });
 
         it('should be present in form data when using the form attribute and located outside of a <form>', async () => {