diff --git a/autotest/Uuid/Uuid.cpp b/autotest/Uuid/Uuid.cpp
new file mode 100644
index 000000000..3ff33dfb8
--- /dev/null
+++ b/autotest/Uuid/Uuid.cpp
@@ -0,0 +1,24 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+CONSOLE_APP_MAIN
+{
+	StdLogSetup(LOG_COUT|LOG_FILE);
+	Uuid id;
+	id.New();
+	DDUMP(id);
+	String s = AsString(id);
+	DDUMP(s);
+	Uuid id2;
+	id2 = ScanUuid(s);
+	DDUMP(id2);
+	ASSERT(id2 == id);
+	id.New();
+	DDUMP(id);
+	s = FormatWithDashes(id);
+	DDUMP(s);
+	id2 = ScanUuid(s);
+	ASSERT(id2 == id);
+	LOG("=================== OK");
+}
diff --git a/autotest/Uuid/Uuid.upp b/autotest/Uuid/Uuid.upp
new file mode 100644
index 000000000..5aee2e9fa
--- /dev/null
+++ b/autotest/Uuid/Uuid.upp
@@ -0,0 +1,9 @@
+uses
+	Core;
+
+file
+	Uuid.cpp;
+
+mainconfig
+	"" = "";
+