diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..52009581
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "Gut"]
+	path = Gut
+	url = https://github.com/bitwes/Gut.git
diff --git a/.gut_editor_config.json b/.gut_editor_config.json
new file mode 100644
index 00000000..09e2dc3a
--- /dev/null
+++ b/.gut_editor_config.json
@@ -0,0 +1,44 @@
+{
+ "background_color": "262626ff",
+ "compact_mode": false,
+ "config_file": "res://.gutconfig.json",
+ "dirs": [
+  "res://tests"
+ ],
+ "disable_colors": false,
+ "double_strategy": "partial",
+ "font_color": "ccccccff",
+ "font_name": "CourierPrime",
+ "font_size": 16,
+ "gut_on_top": true,
+ "hide_orphans": false,
+ "ignore_pause": false,
+ "include_subdirs": true,
+ "inner_class": null,
+ "junit_xml_file": "",
+ "junit_xml_timestamp": false,
+ "log_level": 1,
+ "opacity": 100,
+ "paint_after": 0.1,
+ "panel_options": {
+  "font_name": "CourierPrime",
+  "font_size": 30,
+  "hide_output_text": false,
+  "hide_result_tree": false,
+  "hide_settings": false,
+  "use_colors": false
+ },
+ "post_run_script": "",
+ "pre_run_script": "",
+ "prefix": "test_",
+ "selected": null,
+ "should_exit": false,
+ "should_exit_on_success": false,
+ "should_maximize": false,
+ "show_help": false,
+ "suffix": ".gd",
+ "tests": [
+
+ ],
+ "unit_test_name": null
+}
diff --git a/Gut b/Gut
new file mode 160000
index 00000000..878d097b
--- /dev/null
+++ b/Gut
@@ -0,0 +1 @@
+Subproject commit 878d097bed28be3bf2036ed87602cff644d5a6c1
diff --git a/addons/gut b/addons/gut
new file mode 120000
index 00000000..58c403e4
--- /dev/null
+++ b/addons/gut
@@ -0,0 +1 @@
+../Gut/addons/gut
\ No newline at end of file
diff --git a/project.godot b/project.godot
index 61f6af83..19cf01f7 100644
--- a/project.godot
+++ b/project.godot
@@ -20,7 +20,7 @@ gdscript/warnings/exclude_addons=false
 
 [editor_plugins]
 
-enabled=PackedStringArray("res://addons/rmsmartshape/plugin.cfg")
+enabled=PackedStringArray("res://addons/rmsmartshape/plugin.cfg", "res://addons/gut/plugin.cfg")
 
 [physics]
 
diff --git a/scripts/linux/run_integration_tests.sh b/scripts/linux/run_integration_tests.sh
index ce3167fa..8635e636 100755
--- a/scripts/linux/run_integration_tests.sh
+++ b/scripts/linux/run_integration_tests.sh
@@ -1,2 +1,2 @@
 # Must be called from project root folder
-godot -d -s --path $PWD addons/gut/gut_cmdln.gd -gdir=res://gut/integration -gmaximize -glog=2
+godot4 -d -s --path $PWD addons/gut/gut_cmdln.gd -gdir=res://gut/integration -gmaximize -glog=2
diff --git a/scripts/linux/run_test.sh b/scripts/linux/run_test.sh
index 68a8ad3e..46bce358 100755
--- a/scripts/linux/run_test.sh
+++ b/scripts/linux/run_test.sh
@@ -1,2 +1,2 @@
 # Must be called from project root folder
-godot -d -s --path $PWD addons/gut/gut_cmdln.gd -gtest=res://$1 -gmaximize -glog=2
+godot4 -d -s --path $PWD addons/gut/gut_cmdln.gd -gtest=res://$1 -gmaximize -glog=2
diff --git a/scripts/linux/run_tests.sh b/scripts/linux/run_tests.sh
index 76bb08f8..9acabd4f 100755
--- a/scripts/linux/run_tests.sh
+++ b/scripts/linux/run_tests.sh
@@ -1,2 +1,2 @@
 # Must be called from project root folder
-godot -d -s --path $PWD addons/gut/gut_cmdln.gd -gdir=res://gut -gmaximize
+godot4 -d -s --path $PWD addons/gut/gut_cmdln.gd -gdir=res://gut -gmaximize
diff --git a/scripts/linux/run_unit_tests.sh b/scripts/linux/run_unit_tests.sh
index b1798131..df305d38 100755
--- a/scripts/linux/run_unit_tests.sh
+++ b/scripts/linux/run_unit_tests.sh
@@ -1,2 +1,2 @@
 # Must be called from project root folder
-godot -d -s --path $PWD addons/gut/gut_cmdln.gd -gdir=res://gut/unit -gmaximize -glog=2
+godot4 -d -s --path $PWD addons/gut/gut_cmdln.gd -gdir=res://gut/unit -gmaximize -glog=2
diff --git a/gut/integration/test_changed_signal.gd b/tests/integration/test_changed_signal.gd
similarity index 100%
rename from gut/integration/test_changed_signal.gd
rename to tests/integration/test_changed_signal.gd
diff --git a/gut/integration/test_plugin_closed_shape.gd b/tests/integration/test_plugin_closed_shape.gd
similarity index 100%
rename from gut/integration/test_plugin_closed_shape.gd
rename to tests/integration/test_plugin_closed_shape.gd
diff --git a/gut/unit/test.png b/tests/unit/test.png
similarity index 100%
rename from gut/unit/test.png
rename to tests/unit/test.png
diff --git a/gut/unit/test.png.import b/tests/unit/test.png.import
similarity index 73%
rename from gut/unit/test.png.import
rename to tests/unit/test.png.import
index b63de21f..9a65f955 100644
--- a/gut/unit/test.png.import
+++ b/tests/unit/test.png.import
@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://dlk6x3r5o1lhu"
-path="res://.godot/imported/test.png-c79a1e1fdd4269ec53e126e96173ec30.ctex"
+path="res://.godot/imported/test.png-523ef0ec017178034476cd64b5556a31.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://gut/unit/test.png"
-dest_files=["res://.godot/imported/test.png-c79a1e1fdd4269ec53e126e96173ec30.ctex"]
+source_file="res://tests/unit/test.png"
+dest_files=["res://.godot/imported/test.png-523ef0ec017178034476cd64b5556a31.ctex"]
 
 [params]
 
diff --git a/gut/unit/test_anchor.gd b/tests/unit/test_anchor.gd
similarity index 100%
rename from gut/unit/test_anchor.gd
rename to tests/unit/test_anchor.gd
diff --git a/gut/unit/test_edge.gd b/tests/unit/test_edge.gd
similarity index 100%
rename from gut/unit/test_edge.gd
rename to tests/unit/test_edge.gd
diff --git a/gut/unit/test_index_map.gd b/tests/unit/test_index_map.gd
similarity index 100%
rename from gut/unit/test_index_map.gd
rename to tests/unit/test_index_map.gd
diff --git a/gut/unit/test_normal_range.gd b/tests/unit/test_normal_range.gd
similarity index 100%
rename from gut/unit/test_normal_range.gd
rename to tests/unit/test_normal_range.gd
diff --git a/gut/unit/test_plugin.gd b/tests/unit/test_plugin.gd
similarity index 100%
rename from gut/unit/test_plugin.gd
rename to tests/unit/test_plugin.gd
diff --git a/gut/unit/test_point_array.gd b/tests/unit/test_point_array.gd
similarity index 100%
rename from gut/unit/test_point_array.gd
rename to tests/unit/test_point_array.gd
diff --git a/gut/unit/test_shape_base.gd b/tests/unit/test_shape_base.gd
similarity index 100%
rename from gut/unit/test_shape_base.gd
rename to tests/unit/test_shape_base.gd
diff --git a/gut/unit/test_shape_closed.gd b/tests/unit/test_shape_closed.gd
similarity index 100%
rename from gut/unit/test_shape_closed.gd
rename to tests/unit/test_shape_closed.gd
diff --git a/gut/unit/test_shape_material.gd b/tests/unit/test_shape_material.gd
similarity index 100%
rename from gut/unit/test_shape_material.gd
rename to tests/unit/test_shape_material.gd
diff --git a/gut/unit/test_shape_open.gd b/tests/unit/test_shape_open.gd
similarity index 100%
rename from gut/unit/test_shape_open.gd
rename to tests/unit/test_shape_open.gd
diff --git a/gut/unit/test_tuple.gd b/tests/unit/test_tuple.gd
similarity index 100%
rename from gut/unit/test_tuple.gd
rename to tests/unit/test_tuple.gd