diff --git a/test/test-lock.sh b/test/test-lock.sh
new file mode 100755
index 00000000..e97b3183
--- /dev/null
+++ b/test/test-lock.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+. "test/testlib.sh"
+
+begin_test "creating a lock"
+(
+  set -e
+
+  setup_remote_repo_with_file "lock_create_simple" "a.dat"
+
+  git lfs lock "a.dat" | tee lock.log
+  grep "'a.dat' was locked" lock.log
+
+  id=$(grep -oh "\((.*)\)" lock.log | tr -d "()")
+  assert_server_lock $id
+)
+end_test
+
+begin_test "locking a previously locked file"
+(
+  set -e
+
+  setup_remote_repo_with_file "lock_create_previously_created" "a.dat"
+
+  git lfs lock "a.dat" | tee lock.log
+  grep "'a.dat' was locked" lock.log
+
+  id=$(grep -oh "\((.*)\)" lock.log | tr -d "()")
+  assert_server_lock $id
+
+  grep "lock already created" <(git lfs lock "a.dat" 2>&1)
+)
+end_test