diff --git a/eossr/scripts/eossr_upload.py b/eossr/scripts/eossr_upload.py
index 307ecf8725a9705bb784ab1d793d04a6cdfca115..3a39e8aac8da8f47708abeca5077f1cb0fd22d1a 100644
--- a/eossr/scripts/eossr_upload.py
+++ b/eossr/scripts/eossr_upload.py
@@ -6,7 +6,7 @@ from eossr.scripts import eossr_upload_new_version_deposit, eossr_upload_new_dep
 
 def upload(zenodo_token, sandbox_flag, input_directory, deposit_id):
 
-    if args.deposit_id is None:
+    if deposit_id is None:
         print("Uploading a new deposit")
         eossr_upload_new_deposit.upload(zenodo_token, sandbox_flag, input_directory)
 
@@ -44,7 +44,8 @@ def main():
 
     args = parser.parse_args()
 
-    main(args.zenodo_token, args.sandbox_flag, args.input_directory, args.deposit_id)
+    upload(args.zenodo_token, args.sandbox_flag, args.input_directory, args.deposit_id)
+
 
 if __name__ == '__main__':
     main()
diff --git a/eossr/scripts/tests/test_scripts.py b/eossr/scripts/tests/test_scripts.py
index ead140b080a9fab2035590d0dc3b019f0dce3778..87e43e0ded9755808eb3ab8b5f430825fa568dbe 100644
--- a/eossr/scripts/tests/test_scripts.py
+++ b/eossr/scripts/tests/test_scripts.py
@@ -4,6 +4,8 @@
 import pytest
 import subprocess
 import pkg_resources
+import os
+import tempfile
 from os.path import dirname, realpath, join
 
 ROOT_DIR = dirname(realpath("codemeta.json"))
@@ -44,3 +46,10 @@ def test_parse_last_release_git_bash():
 def test_help_all_scripts(script):
     """Test for all scripts if at least the help works"""
     run_script(script, "--help")
+
+
+def test_eossr_upload(tmpdir):
+    _, path_test_filename = tempfile.mkstemp(dir=tmpdir, text='Hello World')
+    run_script("eossr-upload", "-t", os.getenv('SANDBOX_ZENODO_TOKEN'), '-s', 'True', '-i', tmpdir)
+    _, path_test_filename = tempfile.mkstemp(dir=tmpdir, text='Hello World 2')
+    run_script("eossr-upload", "-t", os.getenv('SANDBOX_ZENODO_TOKEN'), '-s', 'True', '-i', tmpdir, '-id', 927522)
\ No newline at end of file