diff --git a/tests/src/com/unciv/logic/map/TileInfoTests.kt b/tests/src/com/unciv/logic/map/TileInfoTests.kt
new file mode 100644
index 0000000000..2dbff5292b
--- /dev/null
+++ b/tests/src/com/unciv/logic/map/TileInfoTests.kt
@@ -0,0 +1,85 @@
+//  Taken from https://github.com/TomGrill/gdx-testing
+package com.unciv.logic.map
+
+import com.unciv.logic.civilization.CivilizationInfo
+import com.unciv.models.ruleset.Ruleset
+import com.unciv.models.ruleset.RulesetCache
+import com.unciv.testing.GdxTestRunner
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(GdxTestRunner::class)
+class TileInfoTests {
+
+    private var tile = TileInfo()
+    private var civInfo = CivilizationInfo()
+    private var ruleSet = Ruleset()
+
+    @Before
+    fun initTheWorld() {
+        RulesetCache.loadRulesets()
+        ruleSet = RulesetCache.getBaseRuleset()
+        tile.ruleset = ruleSet
+        civInfo.tech.researchedTechnologies.addAll(ruleSet.technologies.values)
+        civInfo.tech.techsResearched.addAll(ruleSet.technologies.keys)
+    }
+
+
+    @Test
+    fun allTerrainSpecificImprovementsCanBeBuilt() {
+        for (improvement in ruleSet.tileImprovements.values) {
+            val terrain = improvement.terrainsCanBeBuiltOn.firstOrNull() ?: continue
+            tile.baseTerrain = terrain
+            tile.setTransients()
+            val canBeBuilt = tile.canBuildImprovement(improvement, civInfo)
+            Assert.assertTrue( improvement.name, canBeBuilt)
+        }
+    }
+
+    @Test
+    fun allResourceImprovementsCanBeBuilt() {
+        for (improvement in ruleSet.tileImprovements.values) {
+            tile.resource = ruleSet.tileResources.values.firstOrNull { it.improvement == improvement.name}?.name
+            if (tile.resource == null) continue
+            tile.baseTerrain = "Plains"
+            tile.setTransients()
+            val canBeBuilt = tile.canBuildImprovement(improvement, civInfo)
+            Assert.assertTrue( improvement.name, canBeBuilt)
+        }
+    }
+
+    @Test
+    fun coastalImprovementsCanBeBuilt() {
+        val map = TileMap()
+        tile.baseTerrain = "Plains"
+        tile.tileMap = map
+        tile.setTransients()
+
+        val otherTile = tile.clone()
+        otherTile.baseTerrain = "Coast"
+        otherTile.position.y = 1f
+
+        map.tileMatrix.add(arrayListOf(tile, otherTile))
+
+        for (improvement in ruleSet.tileImprovements.values) {
+            if (!improvement.uniques.contains("Can only be built on Coastal tiles")) continue
+            civInfo.civName = improvement.uniqueTo ?: "OtherCiv"
+            val canBeBuilt = tile.canBuildImprovement(improvement, civInfo)
+            Assert.assertTrue( improvement.name, canBeBuilt)
+        }
+    }
+
+    @Test
+    fun uniqueToOtherImprovementsCanNOTBeBuilt() {
+        for (improvement in ruleSet.tileImprovements.values) {
+            if (improvement.uniqueTo == null) continue
+            civInfo.civName = "OtherCiv"
+            tile.baseTerrain = "Plains"
+            tile.setTransients()
+            val canBeBuilt = tile.canBuildImprovement(improvement, civInfo)
+            Assert.assertFalse( improvement.name, canBeBuilt)
+        }
+    }
+}
\ No newline at end of file