diff --git a/Makefile b/Makefile
index 89cdfeb24..97d389d7c 100644
--- a/Makefile
+++ b/Makefile
@@ -125,6 +125,7 @@ TEST_PROGS  := \
 	dirname \
 	echo \
 	env \
+	expr \
 	factor \
 	false \
 	fold \
diff --git a/tests/expr.rs b/tests/expr.rs
new file mode 100644
index 000000000..72d07c499
--- /dev/null
+++ b/tests/expr.rs
@@ -0,0 +1,54 @@
+#[macro_use]
+mod common;
+
+use common::util::*;
+
+static UTIL_NAME: &'static str = "expr";
+
+#[test]
+fn test_simple_arithmetic() {
+    let (_, mut ucmd) = testing(UTIL_NAME);
+    let out = ucmd.args(&["1", "+", "1"]).run().stdout;
+    assert_eq!(out, "2\n");
+
+    let (_, mut ucmd) = testing(UTIL_NAME);
+    let out = ucmd.args(&["1", "-", "1"]).run().stdout;
+    assert_eq!(out, "0\n");
+
+    let (_, mut ucmd) = testing(UTIL_NAME);
+    let out = ucmd.args(&["3", "*", "2"]).run().stdout;
+    assert_eq!(out, "6\n");
+
+    let (_, mut ucmd) = testing(UTIL_NAME);
+    let out = ucmd.args(&["4", "/", "2"]).run().stdout;
+    assert_eq!(out, "2\n");
+}
+
+#[test]
+fn test_parenthesis() {
+    let (_, mut ucmd) = testing(UTIL_NAME);
+    let out = ucmd.args(&["(", "1", "+", "1", ")", "*", "2"]).run().stdout;
+    assert_eq!(out, "4\n");
+}
+
+#[test]
+fn test_or() {
+    let (_, mut ucmd) = testing(UTIL_NAME);
+    let out = ucmd.args(&["0", "|", "foo"]).run().stdout;
+    assert_eq!(out, "foo\n");
+
+    let (_, mut ucmd) = testing(UTIL_NAME);
+    let out = ucmd.args(&["foo", "|", "bar"]).run().stdout;
+    assert_eq!(out, "foo\n");
+}
+
+#[test]
+fn test_and() {
+    let (_, mut ucmd) = testing(UTIL_NAME);
+    let out = ucmd.args(&["foo", "&", "1"]).run().stdout;
+    assert_eq!(out, "foo\n");
+
+    let (_, mut ucmd) = testing(UTIL_NAME);
+    let out = ucmd.args(&["", "&", "1"]).run().stdout;
+    assert_eq!(out, "0\n");
+}