diff --git a/action/entrypoint.sh b/action/entrypoint.sh
index 6d4eed5..0b5b703 100644
--- a/action/entrypoint.sh
+++ b/action/entrypoint.sh
@@ -1,5 +1,12 @@
 #!/usr/bin/env bash
 
+#
+# Create directory for license activation
+#
+
+ACTIVATE_LICENSE_PATH="$GITHUB_WORKSPACE/_activate-license"
+mkdir -p "$ACTIVATE_LICENSE_PATH"
+
 #
 # Run steps
 #
@@ -8,6 +15,12 @@ source /steps/activate.sh
 source /steps/run_tests.sh
 source /steps/return_license.sh
 
+#
+# Remove license activation directory
+#
+
+rm -r "$ACTIVATE_LICENSE_PATH"
+
 #
 # Instructions for debugging
 #
diff --git a/action/steps/activate.sh b/action/steps/activate.sh
index 36991f8..707afa7 100644
--- a/action/steps/activate.sh
+++ b/action/steps/activate.sh
@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
 
-# Run in a new empty directory
-ACTIVATE_LICENSE_PATH="$GITHUB_WORKSPACE/_activate-license"
-echo "Creating and changing to \"$ACTIVATE_LICENSE_PATH\" directory."
-mkdir -p "$ACTIVATE_LICENSE_PATH"
+# Run in ACTIVATE_LICENSE_PATH directory
+echo "Changing to \"$ACTIVATE_LICENSE_PATH\" directory."
 pushd "$ACTIVATE_LICENSE_PATH"
 
 if [[ -n "$UNITY_LICENSE" ]] || [[ -n "$UNITY_LICENSE_FILE"  ]]; then
diff --git a/action/steps/return_license.sh b/action/steps/return_license.sh
index b9a5fc6..46f8120 100644
--- a/action/steps/return_license.sh
+++ b/action/steps/return_license.sh
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
 # Run in ACTIVATE_LICENSE_PATH directory
-ACTIVATE_LICENSE_PATH="$GITHUB_WORKSPACE/_activate-license"
 echo "Changing to \"$ACTIVATE_LICENSE_PATH\" directory."
 pushd "$ACTIVATE_LICENSE_PATH"
 
@@ -21,7 +20,3 @@ fi
 
 # Return to previous working directory
 popd
-
-# Deleting ACTIVATE_LICENSE_PATH directory
-echo "Deleting \"$ACTIVATE_LICENSE_PATH\" directory."
-rm -r "$ACTIVATE_LICENSE_PATH"