diff --git a/upptst/STL/STL.cpp b/upptst/STL/STL.cpp
new file mode 100644
index 000000000..0d75e4bb6
--- /dev/null
+++ b/upptst/STL/STL.cpp
@@ -0,0 +1,34 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+template <class T>
+void Check()
+{
+	T a;
+	std::includes(a.begin(), a.end(), a.begin(), a.end());
+	
+	const T& b = a;
+	std::includes(b.begin(), b.end(), b.begin(), b.end());
+}
+
+CONSOLE_APP_MAIN
+{
+	Check< Vector<int> > ();
+	Check< Array<int> > ();
+
+	Check< BiVector<int> > ();
+	Check< BiArray<int> > ();
+
+	Check< Index<int> > ();
+	Check< ArrayIndex<int> > ();
+	Check< VectorMap<int, int> > ();
+	Check< ArrayMap<int, int> > ();
+
+	Check< InVector<int> > ();
+	Check< InArray<int> > ();
+
+	Check< SortedIndex<int> > ();
+	Check< SortedVectorMap<int, int> > ();
+	Check< SortedArrayMap<int, int> > ();
+}
diff --git a/upptst/STL/STL.upp b/upptst/STL/STL.upp
new file mode 100644
index 000000000..df1731907
--- /dev/null
+++ b/upptst/STL/STL.upp
@@ -0,0 +1,9 @@
+uses
+	Core;
+
+file
+	STL.cpp;
+
+mainconfig
+	"" = "SSE2";
+
diff --git a/upptst/STL/init b/upptst/STL/init
new file mode 100644
index 000000000..ae94b3635
--- /dev/null
+++ b/upptst/STL/init
@@ -0,0 +1,4 @@
+#ifndef _STL_icpp_init_stub
+#define _STL_icpp_init_stub
+#include "Core/init"
+#endif