diff --git a/tests/test_data/layer_tests/no_layers/expected.py b/tests/test_data/layer_tests/no_layers/expected.py
new file mode 100644
index 0000000..28461fd
--- /dev/null
+++ b/tests/test_data/layer_tests/no_layers/expected.py
@@ -0,0 +1,3 @@
+from pytiled_parser import common_types, layer
+
+EXPECTED = []
diff --git a/tests/test_data/layer_tests/no_layers/map.json b/tests/test_data/layer_tests/no_layers/map.json
new file mode 100644
index 0000000..ac423c0
--- /dev/null
+++ b/tests/test_data/layer_tests/no_layers/map.json
@@ -0,0 +1,63 @@
+{ "compressionlevel":0,
+ "editorsettings":
+    {
+     "export":
+        {
+         "target":"."
+        }
+    },
+ "height":6,
+ "infinite":false,
+ "layers":[],
+ "nextlayerid":2,
+ "nextobjectid":1,
+ "orientation":"orthogonal",
+ "properties":[
+        {
+         "name":"bool property - false",
+         "type":"bool",
+         "value":false
+        }, 
+        {
+         "name":"bool property - true",
+         "type":"bool",
+         "value":true
+        }, 
+        {
+         "name":"color property",
+         "type":"color",
+         "value":"#ff49fcff"
+        }, 
+        {
+         "name":"file property",
+         "type":"file",
+         "value":"..\/..\/..\/..\/..\/..\/var\/log\/syslog"
+        }, 
+        {
+         "name":"float property",
+         "type":"float",
+         "value":1.23456789
+        }, 
+        {
+         "name":"int property",
+         "type":"int",
+         "value":13
+        }, 
+        {
+         "name":"string property",
+         "type":"string",
+         "value":"Hello, World!!"
+        }],
+ "renderorder":"right-down",
+ "tiledversion":"1.4.1",
+ "tileheight":32,
+ "tilesets":[
+        {
+         "firstgid":1,
+         "source":"tileset_image.json"
+        }],
+ "tilewidth":32,
+ "type":"map",
+ "version":1.4,
+ "width":8
+}
\ No newline at end of file
diff --git a/tests/test_data/layer_tests/no_layers/tileset_image.json b/tests/test_data/layer_tests/no_layers/tileset_image.json
new file mode 100644
index 0000000..e88a3f1
--- /dev/null
+++ b/tests/test_data/layer_tests/no_layers/tileset_image.json
@@ -0,0 +1,14 @@
+{ "columns":8,
+ "image":"..\/..\/images\/tmw_desert_spacing.png",
+ "imageheight":199,
+ "imagewidth":265,
+ "margin":1,
+ "name":"tile_set_image",
+ "spacing":1,
+ "tilecount":48,
+ "tiledversion":"1.3.1",
+ "tileheight":32,
+ "tilewidth":32,
+ "type":"tileset",
+ "version":1.2
+}
diff --git a/tests/test_layer.py b/tests/test_layer.py
index 6e03281..06233d6 100644
--- a/tests/test_layer.py
+++ b/tests/test_layer.py
@@ -15,6 +15,7 @@ LAYER_TESTS = TEST_DATA / "layer_tests"
 
 ALL_LAYER_TESTS = [
     LAYER_TESTS / "all_layer_types",
+    LAYER_TESTS / "no_layers",
 ]