diff --git a/graduate.sh b/graduate.sh
index f087b68..0cd02de 100755
--- a/graduate.sh
+++ b/graduate.sh
@@ -66,8 +66,10 @@ else
     git mv openstack/common oslo_${new_lib}
 fi
 rmdir openstack
-git mv tests/* oslo_${new_lib}/tests/
-rmdir tests
+if [[ -d tests ]]; then
+    git mv tests/* oslo_${new_lib}/tests/
+    rmdir tests
+fi
 
 # Fix imports after moving files
 echo "Fixing imports..."