diff --git a/src/test/stdtest/int.rs b/src/test/stdtest/int.rs
new file mode 100644
index 00000000000..d9432bc0722
--- /dev/null
+++ b/src/test/stdtest/int.rs
@@ -0,0 +1,23 @@
+import std::int;
+import std::str::eq;
+
+#[test]
+fn test_to_str() {
+    assert (eq(int::to_str(0, 10u), "0"));
+    assert (eq(int::to_str(1, 10u), "1"));
+    assert (eq(int::to_str(-1, 10u), "-1"));
+    assert (eq(int::to_str(255, 16u), "ff"));
+    assert (eq(int::to_str(100, 10u), "100"));
+}
+
+#[test]
+fn test_pow() {
+    assert (int::pow(0, 0u) == 1);
+    assert (int::pow(0, 1u) == 0);
+    assert (int::pow(0, 2u) == 0);
+    assert (int::pow(-1, 0u) == 1);
+    assert (int::pow(1, 0u) == 1);
+    assert (int::pow(-3, 2u) == 9);
+    assert (int::pow(-3, 3u) == -27);
+    assert (int::pow(4, 9u) == 262144);
+}
diff --git a/src/test/stdtest/sha1.rs b/src/test/stdtest/sha1.rs
new file mode 100644
index 00000000000..4244ac4960a
--- /dev/null
+++ b/src/test/stdtest/sha1.rs
@@ -0,0 +1,85 @@
+import std::sha1;
+import std::vec;
+import std::str;
+
+#[test]
+fn test() {
+    type test = rec(str input, vec[u8] output);
+
+    fn a_million_letter_a() -> str {
+        auto i = 0;
+        auto rs = "";
+        while (i < 100000) { rs += "aaaaaaaaaa"; i += 1; }
+        ret rs;
+    }
+    // Test messages from FIPS 180-1
+
+    let vec[test] fips_180_1_tests =
+        [rec(input="abc",
+             output=[0xA9u8, 0x99u8, 0x3Eu8, 0x36u8, 0x47u8, 0x06u8, 0x81u8,
+                     0x6Au8, 0xBAu8, 0x3Eu8, 0x25u8, 0x71u8, 0x78u8, 0x50u8,
+                     0xC2u8, 0x6Cu8, 0x9Cu8, 0xD0u8, 0xD8u8, 0x9Du8]),
+         rec(input="abcdbcdecdefdefgefghfghighij" +
+                       "hijkijkljklmklmnlmnomnopnopq",
+             output=[0x84u8, 0x98u8, 0x3Eu8, 0x44u8, 0x1Cu8, 0x3Bu8, 0xD2u8,
+                     0x6Eu8, 0xBAu8, 0xAEu8, 0x4Au8, 0xA1u8, 0xF9u8, 0x51u8,
+                     0x29u8, 0xE5u8, 0xE5u8, 0x46u8, 0x70u8, 0xF1u8]),
+         rec(input=a_million_letter_a(),
+             output=[0x34u8, 0xAAu8, 0x97u8, 0x3Cu8, 0xD4u8, 0xC4u8, 0xDAu8,
+                     0xA4u8, 0xF6u8, 0x1Eu8, 0xEBu8, 0x2Bu8, 0xDBu8, 0xADu8,
+                     0x27u8, 0x31u8, 0x65u8, 0x34u8, 0x01u8, 0x6Fu8])];
+    // Examples from wikipedia
+
+    let vec[test] wikipedia_tests =
+        [rec(input="The quick brown fox jumps over the lazy dog",
+             output=[0x2fu8, 0xd4u8, 0xe1u8, 0xc6u8, 0x7au8, 0x2du8, 0x28u8,
+                     0xfcu8, 0xedu8, 0x84u8, 0x9eu8, 0xe1u8, 0xbbu8, 0x76u8,
+                     0xe7u8, 0x39u8, 0x1bu8, 0x93u8, 0xebu8, 0x12u8]),
+         rec(input="The quick brown fox jumps over the lazy cog",
+             output=[0xdeu8, 0x9fu8, 0x2cu8, 0x7fu8, 0xd2u8, 0x5eu8, 0x1bu8,
+                     0x3au8, 0xfau8, 0xd3u8, 0xe8u8, 0x5au8, 0x0bu8, 0xd1u8,
+                     0x7du8, 0x9bu8, 0x10u8, 0x0du8, 0xb4u8, 0xb3u8])];
+    auto tests = fips_180_1_tests + wikipedia_tests;
+    fn check_vec_eq(vec[u8] v0, vec[u8] v1) {
+        assert (vec::len[u8](v0) == vec::len[u8](v1));
+        auto len = vec::len[u8](v0);
+        auto i = 0u;
+        while (i < len) {
+            auto a = v0.(i);
+            auto b = v1.(i);
+            assert (a == b);
+            i += 1u;
+        }
+    }
+    // Test that it works when accepting the message all at once
+
+    auto sh = sha1::mk_sha1();
+    for (test t in tests) {
+        sh.input_str(t.input);
+        auto out = sh.result();
+        check_vec_eq(t.output, out);
+        sh.reset();
+    }
+
+    // Test that it works when accepting the message in pieces
+    for (test t in tests) {
+        auto len = str::byte_len(t.input);
+        auto left = len;
+        while (left > 0u) {
+            auto take = (left + 1u) / 2u;
+            sh.input_str(str::substr(t.input, len - left, take));
+            left = left - take;
+        }
+        auto out = sh.result();
+        check_vec_eq(t.output, out);
+        sh.reset();
+    }
+}
+// Local Variables:
+// mode: rust;
+// fill-column: 78;
+// indent-tabs-mode: nil
+// c-basic-offset: 4
+// buffer-file-coding-system: utf-8-unix
+// compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+// End:
diff --git a/src/test/stdtest/stdtest.rc b/src/test/stdtest/stdtest.rc
index 07dd277d18c..ab455001b61 100644
--- a/src/test/stdtest/stdtest.rc
+++ b/src/test/stdtest/stdtest.rc
@@ -1,5 +1,7 @@
 use std;
 
+mod sha1;
+mod int;
 // Local Variables:
 // mode: rust
 // fill-column: 78;