diff --git a/autotest/Nvl/Nvl.cpp b/autotest/Nvl/Nvl.cpp
new file mode 100644
index 000000000..ff1878ff5
--- /dev/null
+++ b/autotest/Nvl/Nvl.cpp
@@ -0,0 +1,32 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+CONSOLE_APP_MAIN
+{
+	int x = Null;
+	
+	ASSERT(Nvl(1, 2, 3, 4, 5) == 1);
+	ASSERT(Nvl(x, 2, 3, 4, 5) == 2);
+	ASSERT(Nvl(x, x, 3, 4, 5) == 3);
+	ASSERT(Nvl(x, x, x, 4, 5) == 4);
+	ASSERT(Nvl(x, x, x, x, 5) == 5);
+	ASSERT(Nvl(1, x, 3, x, 5) == 1);
+	ASSERT(Nvl(x, x, 3, x, 5) == 3);
+	ASSERT(IsNull(Nvl(x, x, x, x, x)));
+
+	ASSERT(Nvl(1, 2, 3, 4) == 1);
+	ASSERT(Nvl(x, 2, 3, 4) == 2);
+	ASSERT(Nvl(x, x, 3, 4) == 3);
+	ASSERT(Nvl(x, x, x, 4) == 4);
+	ASSERT(Nvl(1, x, 3, x) == 1);
+	ASSERT(Nvl(x, x, 3, x) == 3);
+	ASSERT(IsNull(Nvl(x, x, x, x)));
+
+	ASSERT(Nvl(1, 2, 3) == 1);
+	ASSERT(Nvl(x, 2, 3) == 2);
+	ASSERT(Nvl(x, x, 3) == 3);
+	ASSERT(Nvl(1, x, 3) == 1);
+	ASSERT(Nvl(x, x, 3) == 3);
+	ASSERT(IsNull(Nvl(x, x, x)));
+}
diff --git a/autotest/Nvl/Nvl.upp b/autotest/Nvl/Nvl.upp
new file mode 100644
index 000000000..a75e777a0
--- /dev/null
+++ b/autotest/Nvl/Nvl.upp
@@ -0,0 +1,9 @@
+uses
+	Core;
+
+file
+	Nvl.cpp;
+
+mainconfig
+	"" = "";
+
diff --git a/autotest/Nvl/init b/autotest/Nvl/init
new file mode 100644
index 000000000..c7979ced0
--- /dev/null
+++ b/autotest/Nvl/init
@@ -0,0 +1,4 @@
+#ifndef _Nvl_icpp_init_stub
+#define _Nvl_icpp_init_stub
+#include "Core/init"
+#endif