diff --git a/olm.py b/python/olm.py
similarity index 99%
rename from olm.py
rename to python/olm.py
index 80ac62e2373944fbf3c2cc499132902c2b8d4d9f..c210055e2c56b1ca678d47564a40d2af840f8d1e 100755
--- a/olm.py
+++ b/python/olm.py
@@ -4,7 +4,7 @@ import json
 import os
 
 lib = cdll.LoadLibrary(os.path.join(
-    os.path.dirname(__file__), "build", "libolm.so")
+    os.path.dirname(__file__), "..", "build", "libolm.so")
 )
 
 
diff --git a/python/test_olm.sh b/python/test_olm.sh
new file mode 100755
index 0000000000000000000000000000000000000000..78cd3c2287231eed38b029f076845b662a32327b
--- /dev/null
+++ b/python/test_olm.sh
@@ -0,0 +1,22 @@
+#! /bin/bash
+
+OLM="$(dirname $0)/olm.py"
+
+ALICE_ACCOUNT=alice.account
+ALICE_SESSION=alice.session
+BOB_ACCOUNT=bob.account
+BOB_SESSION=bob.session
+
+rm $ALICE_ACCOUNT $BOB_ACCOUNT
+rm $ALICE_SESSION $BOB_SESSION
+
+$OLM create_account $ALICE_ACCOUNT
+$OLM create_account $BOB_ACCOUNT
+$OLM generate_keys $BOB_ACCOUNT 1
+
+BOB_IDENTITY_KEY="$($OLM keys --json $BOB_ACCOUNT | jq -r .account_keys.curve25519)"
+BOB_ONE_TIME_KEY="$($OLM keys --json $BOB_ACCOUNT | jq -r '.one_time_keys.curve25519|to_entries[0].value')"
+
+$OLM outbound $ALICE_ACCOUNT $ALICE_SESSION "$BOB_IDENTITY_KEY" "$BOB_ONE_TIME_KEY"
+
+echo "Hello world" | $OLM encrypt $ALICE_SESSION - - | $OLM inbound $BOB_ACCOUNT $BOB_SESSION - -