diff --git a/include/nlohmann/detail/input/input_adapters.hpp b/include/nlohmann/detail/input/input_adapters.hpp
index 8ed0a3965..386fd0ea2 100644
--- a/include/nlohmann/detail/input/input_adapters.hpp
+++ b/include/nlohmann/detail/input/input_adapters.hpp
@@ -399,7 +399,7 @@ class input_adapter
     /// input adapter for array
     template<class T, std::size_t N>
     input_adapter(T (&array)[N])
-        : input_adapter(std::begin(array), std::end(array)) {}
+        : input_adapter(std::begin(array), array[N - 1] == 0 ? std::prev(std::end(array)) : std::end(array)) {}
 
     /// input adapter for contiguous container
     template<class ContiguousContainer, typename
diff --git a/include/nlohmann/detail/input/lexer.hpp b/include/nlohmann/detail/input/lexer.hpp
index 6f8b32c0d..926175ca7 100644
--- a/include/nlohmann/detail/input/lexer.hpp
+++ b/include/nlohmann/detail/input/lexer.hpp
@@ -1461,7 +1461,6 @@ scan_number_done:
 
             // end of input (the null byte is needed when parsing from
             // string literals)
-            case '\0':
             case std::char_traits<char>::eof():
                 return token_type::end_of_input;
 
diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
index ee72531b7..15c49302d 100644
--- a/single_include/nlohmann/json.hpp
+++ b/single_include/nlohmann/json.hpp
@@ -2554,7 +2554,7 @@ class input_adapter
     /// input adapter for array
     template<class T, std::size_t N>
     input_adapter(T (&array)[N])
-        : input_adapter(std::begin(array), std::end(array)) {}
+        : input_adapter(std::begin(array), array[N - 1] == 0 ? std::prev(std::end(array)) : std::end(array)) {}
 
     /// input adapter for contiguous container
     template<class ContiguousContainer, typename
@@ -4043,7 +4043,6 @@ scan_number_done:
 
             // end of input (the null byte is needed when parsing from
             // string literals)
-            case '\0':
             case std::char_traits<char>::eof():
                 return token_type::end_of_input;
 
diff --git a/test/src/unit-testsuites.cpp b/test/src/unit-testsuites.cpp
index f930c9745..99b9f5c29 100644
--- a/test/src/unit-testsuites.cpp
+++ b/test/src/unit-testsuites.cpp
@@ -688,7 +688,7 @@ TEST_CASE("nst's JSONTestSuite")
                         "test/data/nst_json_testsuite/test_parsing/n_number_real_with_invalid_utf8_after_e.json",
                         "test/data/nst_json_testsuite/test_parsing/n_number_real_without_fractional_part.json",
                         "test/data/nst_json_testsuite/test_parsing/n_number_starting_with_dot.json",
-                        //"test/data/nst_json_testsuite/test_parsing/n_number_then_00.json",
+                        "test/data/nst_json_testsuite/test_parsing/n_number_then_00.json",
                         "test/data/nst_json_testsuite/test_parsing/n_number_with_alpha.json",
                         "test/data/nst_json_testsuite/test_parsing/n_number_with_alpha_char.json",
                         "test/data/nst_json_testsuite/test_parsing/n_number_with_leading_zero.json",
@@ -1067,7 +1067,7 @@ TEST_CASE("nst's JSONTestSuite (2)")
                         "test/data/nst_json_testsuite2/test_parsing/n_incomplete_false.json",
                         "test/data/nst_json_testsuite2/test_parsing/n_incomplete_null.json",
                         "test/data/nst_json_testsuite2/test_parsing/n_incomplete_true.json",
-                        //"test/data/nst_json_testsuite2/test_parsing/n_multidigit_number_then_00.json",
+                        "test/data/nst_json_testsuite2/test_parsing/n_multidigit_number_then_00.json",
                         "test/data/nst_json_testsuite2/test_parsing/n_number_++.json",
                         "test/data/nst_json_testsuite2/test_parsing/n_number_+1.json",
                         "test/data/nst_json_testsuite2/test_parsing/n_number_+Inf.json",