diff --git a/tests/scripts/tileset.lua b/tests/scripts/tileset.lua
index e2761cd0d..cb3ca6fec 100644
--- a/tests/scripts/tileset.lua
+++ b/tests/scripts/tileset.lua
@@ -1,10 +1,11 @@
--- Copyright (C) 2022  Igara Studio S.A.
+-- Copyright (C) 2022-2023  Igara Studio S.A.
 --
 -- This file is released under the terms of the MIT license.
 -- Read LICENSE.txt for more information.
 
 dofile('./test_utils.lua')
 
+-- Create a Tilemap and manipulate its Tileset
 do
   local spr = Sprite(4, 4, ColorMode.INDEXED)
 
@@ -49,3 +50,69 @@ do
     assert(tileset:tile(ti).image.id == tileset:getTile(ti).id)
   end
 end
+
+-- Create and delete Tilesets
+do
+  local spr = Sprite(4, 4, ColorMode.INDEXED)
+
+  -- Create a tileset with default parameters
+  local tileset = spr:newTileset()
+  assert(#tileset == 1)
+  assert(tileset.grid.origin.x == 0)
+  assert(tileset.grid.origin.y == 0)
+  assert(tileset.grid.tileSize.width == 16)
+  assert(tileset.grid.tileSize.height == 16)
+  assert(tileset.name == "")
+  assert(#spr.tilesets == 1)
+
+  -- Create a tileset passing a grid
+  local tileset2 = spr:newTileset(Grid{0, 0 ,32, 32})
+  assert(#tileset2 == 1)
+  assert(tileset2.grid.origin.x == 0)
+  assert(tileset2.grid.origin.y == 0)
+  assert(tileset2.grid.tileSize.width == 32)
+  assert(tileset2.grid.tileSize.height == 32)
+  assert(tileset2.name == "")
+  assert(#spr.tilesets == 2)
+
+  -- Create a tileset passing a table and a number of tiles
+  local tileset3 = spr:newTileset({0, 0 ,64, 64}, 5)
+  assert(#tileset3 == 5)
+  assert(tileset3.grid.origin.x == 0)
+  assert(tileset3.grid.origin.y == 0)
+  assert(tileset3.grid.tileSize.width == 64)
+  assert(tileset3.grid.tileSize.height == 64)
+  assert(tileset3.name == "")
+  assert(#spr.tilesets == 3)
+  tileset3.name = "Tileset 3"
+
+  -- Duplicate a tileset
+  local tileset4 = spr:newTileset(tileset3)
+  assert(#tileset4 == 5)
+  assert(tileset4.grid.origin.x == 0)
+  assert(tileset4.grid.origin.y == 0)
+  assert(tileset4.grid.tileSize.width == 64)
+  assert(tileset4.grid.tileSize.height == 64)
+  assert(tileset4.name == "Tileset 3")
+  assert(#spr.tilesets == 4)
+
+  -- Undo last tileset addition
+  app.undo()
+  assert(#spr.tilesets == 3)
+
+  -- Delete tileset
+  spr:deleteTileset(2)
+  assert(#spr.tilesets == 2)
+  spr:deleteTileset(tileset2)
+  assert(#spr.tilesets == 1)
+
+  -- Undo last tileset removal
+  app.undo()
+  assert(#spr.tilesets == 2)
+  assert(#tileset2 == 1)
+  assert(tileset2.grid.origin.x == 0)
+  assert(tileset2.grid.origin.y == 0)
+  assert(tileset2.grid.tileSize.width == 32)
+  assert(tileset2.grid.tileSize.height == 32)
+  assert(tileset2.name == "")
+end