diff --git a/.gitignore b/.gitignore
index 708925b5..694d0323 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,6 @@ __pycache__/
 build/
 develop-eggs/
 dist/
-downloads/
 eggs/
 .eggs/
 lib/
@@ -47,6 +46,9 @@ coverage.xml
 .hypothesis/
 .pytest_cache/
 
+# Local data used for tests
+downloads/
+
 # Translations
 *.mo
 *.pot
@@ -89,6 +91,7 @@ venv/
 ENV/
 env.bak/
 venv.bak/
+.vscode
 
 # Spyder project settings
 .spyderproject
@@ -107,4 +110,4 @@ venv.bak/
 
 # Pipenv
 Pipfile
-Pipfile.lock
\ No newline at end of file
+Pipfile.lock
diff --git a/tests/conftest.py b/tests/conftest.py
index 6ff505e3..61aec338 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,6 +1,12 @@
 import pytest
+import os
+
 from frameioclient import FrameioClient
 
-@pytest.fixture
-def frameioclient(token):
-  return FrameioClient("aaaabbbbccccddddeeee")
+token = os.getenv('FRAME_IO_TOKEN')
+
+@pytest.fixture()
+def setup_client():
+  client = FrameioClient(token)
+  return client
+  
\ No newline at end of file
diff --git a/tests/test_frameioclient.py b/tests/test_frameioclient.py
index e60490a8..6c4588a0 100644
--- a/tests/test_frameioclient.py
+++ b/tests/test_frameioclient.py
@@ -1,5 +1,5 @@
-import pytest
 from frameioclient import FrameioClient
 
-def test_FrameioClient(frameioclient):
-  assert type(frameioclient) == FrameioClient
+def test_FrameioClient(setup_client):
+  client = setup_client
+  assert type(client) == FrameioClient
\ No newline at end of file
diff --git a/tests/integration.py b/tests/test_integration.py
similarity index 69%
rename from tests/integration.py
rename to tests/test_integration.py
index 8d0aaa9a..3f1f054e 100644
--- a/tests/integration.py
+++ b/tests/test_integration.py
@@ -4,30 +4,26 @@
 import mimetypes
 import platform
 import time
+import pytest
 
 from frameioclient import FrameioClient
 
-token = os.getenv("FRAMEIO_TOKEN")
-project_id = os.getenv("PROJECT_ID")
-download_asset_id = os.getenv("DOWNLOAD_FOLDER_ID")
+# .env variables used for test assertions
+project_id = os.getenv('PROJECT_ID')
+root_asset_id = os.getenv('ROOT_ASSET_ID')
+download_asset_id = os.getenv('DOWNLOAD_FOLDER_ID')
+upload_folder_id = os.getenv('UPLOAD_FOLDER_ID')
 
 
-# Initialize the client
-def init_client():
-    if len(token) < 5:
-        print("Bad token, exiting test.")
-        sys.exit(1)
-    
-    client = FrameioClient(token)
-    print("Client connection initialized.")
-
-    return client
-
 # Test download functionality
-def test_download(client):
-    print("Testing download function...")
-    os.mkdir('downloads')
+def test_download(setup_client):
+    client = setup_client
 
+    print("Testing download function...")
+    try:
+        os.mkdir('downloads')
+    except FileExistsError:
+        print("Directory already exists, moving on...")
     asset_list = client.get_asset_children(
         download_asset_id,
         page=1,
@@ -43,12 +39,38 @@ def test_download(client):
 
     return True
 
+# Test uploading a single .txt file
+def test_upload_single_file(setup_client, tmpdir):
+    client = setup_client
+    testdir = tmpdir.mkdir('single_file_upload')
+    file = testdir.join('file.txt')
+    file.write('file body')
+    print(file)
+
+    # python-frameio-client only supports uploads in asset form (see library for details)
+    upload_asset = client.create_asset(
+        parent_asset_id=upload_folder_id,
+        name="file.txt",
+        type="file",
+        filetype="text/plain",
+        filesize="10"
+    )
+
+    # Expect FileNotFound exception becaucse it's not a real file
+    with pytest.raises(FileNotFoundError):
+        with open('file.txt', 'rb') as upload_file:        
+                client.upload(upload_asset, upload_file)
+
+    assert file.read() == 'file body'
+    assert upload_asset['name'] == 'file.txt'
+    assert upload_asset['project_id'] == project_id
+    assert upload_asset['parent_id'] == upload_folder_id
+
 # Test upload functionality       
-def test_upload(client):
+def test_upload(setup_client):
+    client = setup_client
     print("Beginning upload test")
     # Create new parent asset
-    project_info = client.get_project(project_id)
-    root_asset_id = project_info['root_asset_id']
     
     print("Creating new folder to upload to")
     new_folder = client.create_asset(
@@ -101,7 +123,8 @@ def flatten_asset_children(asset_children):
     return flat_dict
 
 
-def check_upload_completion(client, download_folder_id, upload_folder_id):
+def check_upload_completion(setup_client, download_folder_id, upload_folder_id):
+    client = setup_client
     # Do a comparison against filenames and filesizes here to make sure they match
 
     print("Beginning upload comparison check")
@@ -151,7 +174,8 @@ def check_upload_completion(client, download_folder_id, upload_folder_id):
     return True
 
 
-def clean_up(client, asset_to_delete):
+def clean_up(setup_client, asset_to_delete):
+    client = setup_client
     print("Removing files from test...")
 
     try:
@@ -160,18 +184,4 @@ def clean_up(client, asset_to_delete):
     except Exception as e:
         print(e)
 
-    return True
-
-def run_test():
-    print("Beginning Integration test...")
-
-    client = init_client()
-    test_download(client)
-    upload_folder_id = test_upload(client)
-    check_upload_completion(client, download_asset_id, upload_folder_id)
-    clean_up(client, upload_folder_id)
-
-    print("Test complete, exiting...")
-
-if __name__ == "__main__":
-    run_test()
+    return True
\ No newline at end of file