diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/SubTypeChangingEffectsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/SubTypeChangingEffectsTest.java
index 3e6a2548199..0aacdcbc848 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/SubTypeChangingEffectsTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/SubTypeChangingEffectsTest.java
@@ -82,7 +82,7 @@ public class SubTypeChangingEffectsTest extends CardTestPlayerBase {
         for (Card card : playerB.getLibrary().getCards(currentGame)) {
             if (card.isCreature()) {
                 Assert.assertEquals(card.getName() + " should not have ORC type", false, card.getSubtype(currentGame).contains(SubType.ORC));
-                Assert.assertEquals(card.getName() + " should have CAR type", true, card.getSubtype(currentGame).contains(SubType.ORC));
+                Assert.assertEquals(card.getName() + " should have CAT type", true, card.getSubtype(currentGame).contains(SubType.CAT));
             }
         }
 
@@ -171,4 +171,137 @@ public class SubTypeChangingEffectsTest extends CardTestPlayerBase {
         }
 
     }
+
+    @Test
+    public void testArcaneAdaptationGiveType() {
+        // As Arcane Adaptation enters the battlefield, choose a creature type.
+        // Creatures you control are the chosen type in addition to their other types. The same is true for creature spells you control and creature cards you own that aren't on the battlefield.
+        addCard(Zone.HAND, playerA, "Arcane Adaptation", 1); // Enchantment {2}{U}
+        addCard(Zone.BATTLEFIELD, playerA, "Swamp", 5);
+
+        addCard(Zone.HAND, playerA, "Silvercoat Lion");
+        addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion");
+        addCard(Zone.GRAVEYARD, playerA, "Silvercoat Lion");
+
+        addCard(Zone.HAND, playerB, "Silvercoat Lion");
+        addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion");
+        addCard(Zone.GRAVEYARD, playerA, "Silvercoat Lion");
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Arcane Adaptation");
+        setChoice(playerA, "Orc");
+
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertPermanentCount(playerA, "Arcane Adaptation", 1);
+
+        Permanent silvercoatLion = getPermanent("Silvercoat Lion", playerA);
+        Assert.assertEquals(true, silvercoatLion.getSubtype(currentGame).contains(SubType.CAT));
+        Assert.assertEquals(true, silvercoatLion.getSubtype(currentGame).contains(SubType.ORC));
+
+        silvercoatLion = getPermanent("Silvercoat Lion", playerB);
+        Assert.assertEquals(true, silvercoatLion.getSubtype(currentGame).contains(SubType.CAT));
+        Assert.assertEquals(false, silvercoatLion.getSubtype(currentGame).contains(SubType.ORC));
+
+        for (Card card : playerA.getLibrary().getCards(currentGame)) {
+            if (card.isCreature()) {
+                Assert.assertEquals(card.getName() + " should have ORC type", true, card.getSubtype(currentGame).contains(SubType.ORC));
+                Assert.assertEquals(card.getName() + " should have CAT type", true, card.getSubtype(currentGame).contains(SubType.CAT));
+            }
+        }
+        for (Card card : playerB.getLibrary().getCards(currentGame)) {
+            if (card.isCreature()) {
+                Assert.assertEquals(card.getName() + " should not have ORC type", false, card.getSubtype(currentGame).contains(SubType.ORC));
+                Assert.assertEquals(card.getName() + " should have CAT type", true, card.getSubtype(currentGame).contains(SubType.CAT));
+            }
+        }
+
+        for (Card card : playerA.getHand().getCards(currentGame)) {
+            if (card.isCreature()) {
+                Assert.assertEquals(card.getName() + " should have ORC type", true, card.getSubtype(currentGame).contains(SubType.ORC));
+                Assert.assertEquals(card.getName() + " should have CAT type", true, card.getSubtype(currentGame).contains(SubType.CAT));
+            }
+        }
+        for (Card card : playerB.getHand().getCards(currentGame)) {
+            if (card.isCreature()) {
+                Assert.assertEquals(card.getName() + " should not have ORC type", false, card.getSubtype(currentGame).contains(SubType.ORC));
+                Assert.assertEquals(card.getName() + " should have CAT type", true, card.getSubtype(currentGame).contains(SubType.CAT));
+            }
+        }
+        for (Card card : playerA.getGraveyard().getCards(currentGame)) {
+            if (card.isCreature()) {
+                Assert.assertEquals(card.getName() + " should have ORC type", true, card.getSubtype(currentGame).contains(SubType.ORC));
+                Assert.assertEquals(card.getName() + " should have CAT type", true, card.getSubtype(currentGame).contains(SubType.CAT));
+            }
+
+        }
+        for (Card card : playerB.getGraveyard().getCards(currentGame)) {
+            if (card.isCreature()) {
+                Assert.assertEquals(card.getName() + " should not have ORC type", false, card.getSubtype(currentGame).contains(SubType.ORC));
+                Assert.assertEquals(card.getName() + " should have CAT type", true, card.getSubtype(currentGame).contains(SubType.CAT));
+            }
+        }
+
+    }
+
+    /**
+     * Arcane Adaptation doesn't revert creature types of non-permanent cards
+     * when it leaves the battlefield
+     */
+    @Test
+    public void testArcaneAdaptationIsRestCorrectly() {
+        // As Arcane Adaptation enters the battlefield, choose a creature type.
+        // Creatures you control are the chosen type in addition to their other types. The same is true for creature spells you control and creature cards you own that aren't on the battlefield.
+        addCard(Zone.HAND, playerA, "Arcane Adaptation", 1); // Enchantment {2}{U}
+        addCard(Zone.BATTLEFIELD, playerA, "Swamp", 5);
+
+        addCard(Zone.HAND, playerA, "Silvercoat Lion");
+        addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion");
+        addCard(Zone.GRAVEYARD, playerA, "Silvercoat Lion");
+
+        addCard(Zone.HAND, playerB, "Disenchant", 1); // Instant
+        addCard(Zone.BATTLEFIELD, playerB, "Plains", 2);
+
+        addCard(Zone.HAND, playerB, "Silvercoat Lion");
+        addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion");
+        addCard(Zone.GRAVEYARD, playerA, "Silvercoat Lion");
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Arcane Adaptation");
+        setChoice(playerA, "Orc");
+
+        castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "Disenchant", "Arcane Adaptation");
+
+        setStopAt(1, PhaseStep.END_TURN);
+        execute();
+
+        assertGraveyardCount(playerA, "Arcane Adaptation", 1);
+        assertGraveyardCount(playerB, "Disenchant", 1);
+
+        Permanent silvercoatLion = getPermanent("Silvercoat Lion", playerA);
+        Assert.assertEquals(true, silvercoatLion.getSubtype(currentGame).contains(SubType.CAT));
+        Assert.assertEquals(false, silvercoatLion.getSubtype(currentGame).contains(SubType.ORC));
+
+        for (Card card : playerA.getLibrary().getCards(currentGame)) {
+            if (card.isCreature()) {
+                Assert.assertEquals(card.getName() + " should not have ORC type", false, card.getSubtype(currentGame).contains(SubType.ORC));
+                Assert.assertEquals(card.getName() + " should have CAT type", true, card.getSubtype(currentGame).contains(SubType.CAT));
+            }
+        }
+
+        for (Card card : playerA.getHand().getCards(currentGame)) {
+            if (card.isCreature()) {
+                Assert.assertEquals(card.getName() + " should not have ORC type", false, card.getSubtype(currentGame).contains(SubType.ORC));
+                Assert.assertEquals(card.getName() + " should have CAT type", true, card.getSubtype(currentGame).contains(SubType.CAT));
+            }
+        }
+
+        for (Card card : playerA.getGraveyard().getCards(currentGame)) {
+            if (card.isCreature()) {
+                Assert.assertEquals(card.getName() + " should not have ORC type", false, card.getSubtype(currentGame).contains(SubType.ORC));
+                Assert.assertEquals(card.getName() + " should have CAT type", true, card.getSubtype(currentGame).contains(SubType.CAT));
+            }
+
+        }
+
+    }
 }