diff --git a/upptst/ConvertOverflow/ConvertOverflow.cpp b/upptst/ConvertOverflow/ConvertOverflow.cpp
new file mode 100644
index 000000000..5a7656a52
--- /dev/null
+++ b/upptst/ConvertOverflow/ConvertOverflow.cpp
@@ -0,0 +1,16 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+#define CHECK_OVERFLOW(s, cls, overflow) { cls x; Value v = x.Scan(s); LOG(s << " -> " << v); }
+
+CONSOLE_APP_MAIN
+{
+	StdLogSetup(LOG_FILE|LOG_COUT);
+
+	CHECK_OVERFLOW("2147483647", ConvertInt, false);
+	CHECK_OVERFLOW("2147483648", ConvertInt, true);
+
+	CHECK_OVERFLOW("-2147483648", ConvertInt, false);
+	CHECK_OVERFLOW("-2147483649", ConvertInt, true);
+}
diff --git a/upptst/ConvertOverflow/ConvertOverflow.upp b/upptst/ConvertOverflow/ConvertOverflow.upp
new file mode 100644
index 000000000..df590d9cb
--- /dev/null
+++ b/upptst/ConvertOverflow/ConvertOverflow.upp
@@ -0,0 +1,9 @@
+uses
+	Core;
+
+file
+	ConvertOverflow.cpp;
+
+mainconfig
+	"" = "SSE2";
+
diff --git a/upptst/ConvertOverflow/init b/upptst/ConvertOverflow/init
new file mode 100644
index 000000000..3de67254d
--- /dev/null
+++ b/upptst/ConvertOverflow/init
@@ -0,0 +1,4 @@
+#ifndef _ConvertOverflow_icpp_init_stub
+#define _ConvertOverflow_icpp_init_stub
+#include "Core/init"
+#endif