diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/deck/CommanderDeckValidationTest.java b/Mage.Tests/src/test/java/org/mage/test/serverside/deck/CommanderDeckValidationTest.java
index baad13f6a4a..ed0d8d0c10a 100644
--- a/Mage.Tests/src/test/java/org/mage/test/serverside/deck/CommanderDeckValidationTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/serverside/deck/CommanderDeckValidationTest.java
@@ -106,4 +106,44 @@ public class CommanderDeckValidationTest extends MageTestPlayerBase {
         deckTester.validate(
                 "Commanders with the 'Choose a Background' ability should be able to have a background as an additional commander");
     }
+
+    @Test()
+    public void testVehicles1() {
+        DeckTester deckTester = new DeckTester(new Commander());
+        deckTester.addMaindeck("Plains", 99);
+
+        deckTester.addSideboard("Parhelion II", 1);
+
+        deckTester.validate("Legendary Vehicles should be able to be a commander");
+    }
+
+    @Test(expected = AssertionError.class)
+    public void testVehicles2() {
+        DeckTester deckTester = new DeckTester(new Commander());
+        deckTester.addMaindeck("Plains", 99);
+
+        deckTester.addSideboard("Dragonfly Suit", 1);
+
+        deckTester.validate("Nonlegendary Vehicles should not be able to be a commander");
+    }
+
+    @Test()
+    public void testSpacecraft1() {
+        DeckTester deckTester = new DeckTester(new Commander());
+        deckTester.addMaindeck("Plains", 99);
+
+        deckTester.addSideboard("The Seriema", 1);
+
+        deckTester.validate("Legendary Spacecraft should be able to be a commander if they can become a creature");
+    }
+
+    @Test(expected = AssertionError.class)
+    public void testSpacecraft2() {
+        DeckTester deckTester = new DeckTester(new Commander());
+        deckTester.addMaindeck("Wastes", 99);
+
+        deckTester.addSideboard("The Eternity Elevator", 1);
+
+        deckTester.validate("Legendary Spacecraft should not be able to be a commander if they can't become a creature");
+    }
 }