diff --git a/test/unordered/at_tests.cpp b/test/unordered/at_tests.cpp
new file mode 100644
index 00000000..149a890c
--- /dev/null
+++ b/test/unordered/at_tests.cpp
@@ -0,0 +1,28 @@
+
+// Copyright 2007 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#include <boost/unordered_map.hpp>
+#include <boost/detail/lightweight_test.hpp>
+#include <string>
+
+int main() {
+    boost::unordered_map<std::string, int> x;
+    typedef boost::unordered_map<std::string, int>::iterator iterator;
+
+    x["one"] = 1;
+    x["two"] = 2;
+
+    BOOST_TEST(x.at("one") == 1);
+    BOOST_TEST(x.at("two") == 2);
+
+    try {
+        x.at("three");
+        BOOST_ERROR("Should have thrown.");
+    }
+    catch(std::out_of_range) {
+    }
+
+    return boost::report_errors();
+}