diff --git a/src/main/java/server/cards/CardDeck.java b/src/main/java/server/cards/CardDeck.java
index bad925a..8a339f6 100644
--- a/src/main/java/server/cards/CardDeck.java
+++ b/src/main/java/server/cards/CardDeck.java
@@ -117,8 +117,9 @@ public class CardDeck {
             logger.error(e);
             throw new LoadingCardsException("file not found");
         }
-        loadCardImage(tribe);
-        loadCardImage(building);
+        // Avoid loading FX Image during Junit Tests
+        if (!shuffle)loadCardImage(tribe);
+        if (!shuffle)loadCardImage(building);
 
         if (shuffle) building = CardDeck.shuffle(building);