diff --git a/src/dawn/tests/DawnTest.cpp b/src/dawn/tests/DawnTest.cpp
index 6f619bbe56..0f0312468b 100644
--- a/src/dawn/tests/DawnTest.cpp
+++ b/src/dawn/tests/DawnTest.cpp
@@ -700,6 +700,11 @@ bool DawnTestBase::IsANGLE() const {
     return !mParam.adapterProperties.adapterName.find("ANGLE");
 }
 
+bool DawnTestBase::IsANGLESwiftShader() const {
+    return !mParam.adapterProperties.adapterName.find("ANGLE") &&
+           (mParam.adapterProperties.adapterName.find("SwiftShader") != std::string::npos);
+}
+
 bool DawnTestBase::IsWARP() const {
     return gpu_info::IsMicrosoftWARP(mParam.adapterProperties.vendorID,
                                      mParam.adapterProperties.deviceID);
diff --git a/src/dawn/tests/DawnTest.h b/src/dawn/tests/DawnTest.h
index fc9588cb40..e1dfe09e9d 100644
--- a/src/dawn/tests/DawnTest.h
+++ b/src/dawn/tests/DawnTest.h
@@ -233,6 +233,7 @@ class DawnTestBase {
     bool IsQualcomm() const;
     bool IsSwiftshader() const;
     bool IsANGLE() const;
+    bool IsANGLESwiftShader() const;
     bool IsWARP() const;
 
     bool IsIntelGen12() const;
diff --git a/src/dawn/tests/end2end/IndexFormatTests.cpp b/src/dawn/tests/end2end/IndexFormatTests.cpp
index 9343629a6b..334c2371d7 100644
--- a/src/dawn/tests/end2end/IndexFormatTests.cpp
+++ b/src/dawn/tests/end2end/IndexFormatTests.cpp
@@ -294,6 +294,9 @@ TEST_P(TriangleStripPrimitiveRestartTests, Uint32PrimitiveRestart) {
 // Same as the above test, but uses an OOB index to emulate primitive restart being disabled,
 // causing point C to be written to.
 TEST_P(TriangleStripPrimitiveRestartTests, Uint32WithoutPrimitiveRestart) {
+    // TODO(crbug.com/dawn/1557): Remove suppression once ANGLE bug is fixed
+    DAWN_SUPPRESS_TEST_IF(IsOpenGLES() && IsANGLESwiftShader());
+
     wgpu::RenderPipeline pipeline = MakeTestPipeline(wgpu::IndexFormat::Uint32);
     wgpu::Buffer indexBuffer =
         utils::CreateBufferFromData<uint32_t>(device, wgpu::BufferUsage::Index,
@@ -419,6 +422,9 @@ TEST_P(LineStripPrimitiveRestartTests, Uint32PrimitiveRestart) {
 // Same as the above test, but uses an OOB index to emulate primitive restart being disabled,
 // causing point A to be written to.
 TEST_P(LineStripPrimitiveRestartTests, Uint32WithoutPrimitiveRestart) {
+    // TODO(crbug.com/dawn/1557): Remove suppression once ANGLE bug is fixed
+    DAWN_SUPPRESS_TEST_IF(IsOpenGLES() && IsANGLESwiftShader());
+
     wgpu::RenderPipeline pipeline =
         MakeTestPipeline(wgpu::IndexFormat::Uint32, wgpu::PrimitiveTopology::LineStrip);