diff --git a/autotest/BiVector/BiVector.cpp b/autotest/BiVector/BiVector.cpp
index eec670102..73b2ae076 100644
--- a/autotest/BiVector/BiVector.cpp
+++ b/autotest/BiVector/BiVector.cpp
@@ -2,7 +2,7 @@
 
 using namespace Upp;
 
-#ifdef flagAUTOTEST
+#ifdef flagLONG
 #define N 100000000
 #else
 #define N 5000000
diff --git a/autotest/BiVector/BiVector.upp b/autotest/BiVector/BiVector.upp
index 0c1b3e76f..28b3343ac 100644
--- a/autotest/BiVector/BiVector.upp
+++ b/autotest/BiVector/BiVector.upp
@@ -6,5 +6,5 @@ file
 
 mainconfig
 	"" = "",
-	"" = "AUTOTEST";
+	"" = "LONG";
 
diff --git a/autotest/FormatUnsafe/FormatUnsafe.cpp b/autotest/FormatUnsafe/FormatUnsafe.cpp
index 9633b36f0..db9e27987 100644
--- a/autotest/FormatUnsafe/FormatUnsafe.cpp
+++ b/autotest/FormatUnsafe/FormatUnsafe.cpp
@@ -2,10 +2,10 @@
 
 using namespace Upp;
 
-#ifdef flagAUTOTEST
-#define N 1000
-#else
+#ifdef flagLONG
 #define N 100000000
+#else
+#define N 1000
 #endif
 
 CONSOLE_APP_MAIN
diff --git a/autotest/StringStream/StringStream.cpp b/autotest/StringStream/StringStream.cpp
index 8470da448..ff3679c66 100644
--- a/autotest/StringStream/StringStream.cpp
+++ b/autotest/StringStream/StringStream.cpp
@@ -2,10 +2,10 @@
 
 using namespace Upp;
 
-#ifdef flagAUTOTEST
-#define N 1000000
-#else
+#ifdef flagLONG
 #define N 100000000
+#else
+#define N 1000000
 #endif
 
 String RandomString(int n)