diff --git a/.Lib9c.Tests/Model/Skill/Adventure/CombatTest.cs b/.Lib9c.Tests/Model/Skill/Adventure/CombatTest.cs
index 06ed7a0c5d..b628676303 100644
--- a/.Lib9c.Tests/Model/Skill/Adventure/CombatTest.cs
+++ b/.Lib9c.Tests/Model/Skill/Adventure/CombatTest.cs
@@ -249,11 +249,10 @@ public void DispelOnDuration_Affect()
         [Fact]
         public void DispelOnDuration_Nothing()
         {
-            const int actionBuffId = 708000; // Dispel with duration
             var actionBuffSheet = _tableSheets.ActionBuffSheet;
 
             // Use Dispel first
-            var dispel = actionBuffSheet.Values.First(bf => bf.Id == actionBuffId);
+            var dispel = actionBuffSheet.Values.First(bf => bf.ActionBuffType == ActionBuffType.Dispel);
             _player.AddBuff(BuffFactory.GetActionBuff(_player.Stats, dispel));
             Assert.Single(_player.Buffs);
 
diff --git a/.Lib9c.Tests/Model/Skill/Arena/ArenaCombatTest.cs b/.Lib9c.Tests/Model/Skill/Arena/ArenaCombatTest.cs
index 3bd23d47a9..d20e1a8ad8 100644
--- a/.Lib9c.Tests/Model/Skill/Arena/ArenaCombatTest.cs
+++ b/.Lib9c.Tests/Model/Skill/Arena/ArenaCombatTest.cs
@@ -217,7 +217,7 @@ public void DispelOnDuration_Nothing()
             );
 
             // Use Dispel first
-            var dispel = _tableSheets.ActionBuffSheet.Values.First(bf => bf.Id == ActionBuffId);
+            var dispel = _tableSheets.ActionBuffSheet.Values.First(bf => bf.ActionBuffType == ActionBuffType.Dispel);
             challenger.AddBuff(BuffFactory.GetActionBuff(challenger.Stats, dispel));
             Assert.Single(challenger.Buffs);