diff --git a/autotest/GetSet/GetSet.cpp b/autotest/GetSet/GetSet.cpp
new file mode 100644
index 000000000..0a9585390
--- /dev/null
+++ b/autotest/GetSet/GetSet.cpp
@@ -0,0 +1,28 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+template <class T>
+void Test()
+{
+	T x;
+	DDUMP(x.Get(0, "321"));
+	ASSERT(x.Get(0, "321") == "321");
+	x.Add("123");
+	DDUMP(x.Get(0, "321"));
+	ASSERT(x.Get(0, "321") == "123");
+	String h = "test";
+	x.Set(1, pick(h));
+	DDUMP(h);
+	ASSERT(h.GetCount() == 0);
+	DDUMP(x);
+	ASSERT(x.GetCount() == 2);
+	ASSERT(x[0] == "123");
+	ASSERT(x[1] == "test");
+}
+
+CONSOLE_APP_MAIN
+{
+	Test<Vector<String>>();
+	Test<Array<String>>();
+}
diff --git a/autotest/GetSet/GetSet.upp b/autotest/GetSet/GetSet.upp
new file mode 100644
index 000000000..249ca7ac3
--- /dev/null
+++ b/autotest/GetSet/GetSet.upp
@@ -0,0 +1,11 @@
+description "Vector/Array Get Set tests\377";
+
+uses
+	Core;
+
+file
+	GetSet.cpp;
+
+mainconfig
+	"" = "";
+