diff --git a/src/test/java/com/projectswg/holocore/resources/support/objects/swg/weapon/WeaponObjectTest.java b/src/test/java/com/projectswg/holocore/resources/support/objects/swg/weapon/WeaponObjectTest.java
new file mode 100644
index 000000000..3f1d055e0
--- /dev/null
+++ b/src/test/java/com/projectswg/holocore/resources/support/objects/swg/weapon/WeaponObjectTest.java
@@ -0,0 +1,32 @@
+package com.projectswg.holocore.resources.support.objects.swg.weapon;
+
+import com.projectswg.holocore.resources.support.objects.ObjectCreator;
+import com.projectswg.holocore.test.resources.GenericCreatureObject;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class WeaponObjectTest {
+	
+	@Test
+	public void yourModifiedAttackSpeedTakesPresentSpeedModsIntoAccount() {
+		WeaponObject weaponObject = (WeaponObject) ObjectCreator.createObjectFromTemplate("object/weapon/melee/unarmed/shared_unarmed_default_player.iff");
+		weaponObject.setType(WeaponType.UNARMED);
+		weaponObject.setAttackSpeed(2.5f);
+		GenericCreatureObject genericCreatureObject = new GenericCreatureObject(1);
+		genericCreatureObject.adjustSkillmod("melee_speed", 0, 25);
+		genericCreatureObject.adjustSkillmod("unarmed_speed", 0, 25);
+		
+		assertEquals(1.25, weaponObject.getModdedWeaponAttackSpeedWithCap(genericCreatureObject), 0);
+	}
+	
+	@Test
+	public void yourModifiedAttackSpeedTakesMissingSpeedModsIntoAccount() {
+		WeaponObject weaponObject = (WeaponObject) ObjectCreator.createObjectFromTemplate("object/weapon/melee/unarmed/shared_unarmed_default_player.iff");
+		weaponObject.setType(WeaponType.UNARMED);
+		weaponObject.setAttackSpeed(2.5f);
+		GenericCreatureObject genericCreatureObject = new GenericCreatureObject(1);
+		
+		assertEquals(2.5f, weaponObject.getModdedWeaponAttackSpeedWithCap(genericCreatureObject), 0);
+	}
+}
\ No newline at end of file