diff --git a/tests/test_blocks.py b/tests/test_blocks.py
index 37eae5be..b6c1b458 100755
--- a/tests/test_blocks.py
+++ b/tests/test_blocks.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 import sys, os
 sys.path.append(".")
-sys.path.append("onionr/")
+sys.path.append("src/")
 import unittest, uuid, hashlib
 
 import onionrblocks
diff --git a/tests/test_commands.py b/tests/test_commands.py
index 35502f9e..c07e059f 100644
--- a/tests/test_commands.py
+++ b/tests/test_commands.py
@@ -1,7 +1,7 @@
 from unittest.mock import patch
 import sys, os
 sys.path.append(".")
-sys.path.append("onionr/")
+sys.path.append("src/")
 import unittest, uuid
 TEST_DIR = 'testdata/%s-%s' % (uuid.uuid4(), os.path.basename(__file__)) + '/'
 print("Test directory:", TEST_DIR)
diff --git a/tests/test_database_actions.py b/tests/test_database_actions.py
index da71645a..06e2baa5 100755
--- a/tests/test_database_actions.py
+++ b/tests/test_database_actions.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 import sys, os
 sys.path.append(".")
-sys.path.append("onionr/")
+sys.path.append("src/")
 import unittest, uuid, sqlite3
 TEST_DIR = 'testdata/%s-%s' % (uuid.uuid4(), os.path.basename(__file__)) + '/'
 print("Test directory:", TEST_DIR)
diff --git a/tests/test_default_config_json.py b/tests/test_default_config_json.py
index e7273a82..a373056b 100644
--- a/tests/test_default_config_json.py
+++ b/tests/test_default_config_json.py
@@ -1,6 +1,6 @@
 import sys, os
 sys.path.append(".")
-sys.path.append("onionr/")
+sys.path.append("src/")
 import unittest, uuid, json
 TEST_DIR = 'testdata/%s-%s' % (uuid.uuid4(), os.path.basename(__file__)) + '/'
 print("Test directory:", TEST_DIR)
diff --git a/tests/test_filepaths.py b/tests/test_filepaths.py
index 13890174..6ff47845 100644
--- a/tests/test_filepaths.py
+++ b/tests/test_filepaths.py
@@ -1,6 +1,6 @@
 import sys, os
 sys.path.append(".")
-sys.path.append("onionr/")
+sys.path.append("src/")
 import unittest, uuid
 TEST_DIR = 'testdata/%s-%s' % (uuid.uuid4(), os.path.basename(__file__)) + '/'
 print("Test directory:", TEST_DIR)
diff --git a/tests/test_forward_secrecy.py b/tests/test_forward_secrecy.py
index 7071baae..62f35b02 100755
--- a/tests/test_forward_secrecy.py
+++ b/tests/test_forward_secrecy.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 import sys, os, random
 sys.path.append(".")
-sys.path.append("onionr/")
+sys.path.append("src/")
 import unittest, uuid
 TEST_DIR_1 = 'testdata/%s-%s' % (uuid.uuid4(), os.path.basename(__file__)) + '/'
 TEST_DIR_2 = 'testdata/%s-%s' % (uuid.uuid4(), os.path.basename(__file__)) + '/'
diff --git a/tests/test_getopenport.py b/tests/test_getopenport.py
index 78c42905..9a690f02 100644
--- a/tests/test_getopenport.py
+++ b/tests/test_getopenport.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 import sys, os
 sys.path.append(".")
-sys.path.append("onionr/")
+sys.path.append("src/")
 import unittest, uuid
 
 TEST_DIR = 'testdata/%s-%s' % (uuid.uuid4(), os.path.basename(__file__)) + '/'
diff --git a/tests/test_highlevelcrypto.py b/tests/test_highlevelcrypto.py
index f13e7398..9317f720 100755
--- a/tests/test_highlevelcrypto.py
+++ b/tests/test_highlevelcrypto.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 import sys, os
 sys.path.append(".")
-sys.path.append("onionr/")
+sys.path.append("src/")
 import unittest, uuid, hashlib, base64
 import nacl.exceptions
 import nacl.signing, nacl.hash, nacl.encoding
diff --git a/tests/test_identifyhome.py b/tests/test_identifyhome.py
index 7ab803ab..a2bc9e3f 100644
--- a/tests/test_identifyhome.py
+++ b/tests/test_identifyhome.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 import sys, os
 sys.path.append(".")
-sys.path.append("onionr/")
+sys.path.append("src/")
 import unittest, uuid
 from utils import identifyhome
 
diff --git a/tests/test_keymanager.py b/tests/test_keymanager.py
index 610ee67c..818354af 100644
--- a/tests/test_keymanager.py
+++ b/tests/test_keymanager.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 import sys, os
 sys.path.append(".")
-sys.path.append("onionr/")
+sys.path.append("src/")
 import unittest, uuid
 
 TEST_DIR = 'testdata/%s-%s' % (uuid.uuid4(), os.path.basename(__file__)) + '/'
diff --git a/tests/test_networkmerger.py b/tests/test_networkmerger.py
index dc9c9f0d..bb6643c0 100644
--- a/tests/test_networkmerger.py
+++ b/tests/test_networkmerger.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 import sys, os
 sys.path.append(".")
-sys.path.append("onionr/")
+sys.path.append("src/")
 import unittest, uuid
 
 TEST_DIR = 'testdata/%s-%s' % (uuid.uuid4(), os.path.basename(__file__)) + '/'
diff --git a/tests/test_onionrusers.py b/tests/test_onionrusers.py
index 4d902eca..73590cbb 100755
--- a/tests/test_onionrusers.py
+++ b/tests/test_onionrusers.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 import sys, os
 sys.path.append(".")
-sys.path.append("onionr/")
+sys.path.append("src/")
 import unittest, uuid
 import json
 TEST_DIR = 'testdata/%s-%s' % (uuid.uuid4(), os.path.basename(__file__)) + '/'
diff --git a/tests/test_peerprofiles.py b/tests/test_peerprofiles.py
index c1877bfd..160fdc4c 100644
--- a/tests/test_peerprofiles.py
+++ b/tests/test_peerprofiles.py
@@ -1,6 +1,6 @@
 import sys, os
 sys.path.append(".")
-sys.path.append("onionr/")
+sys.path.append("src/")
 import unittest, uuid
 import base64
 
diff --git a/tests/test_storagecounter.py b/tests/test_storagecounter.py
index f0b0d832..8e6fdcca 100644
--- a/tests/test_storagecounter.py
+++ b/tests/test_storagecounter.py
@@ -1,6 +1,6 @@
 import sys, os
 sys.path.append(".")
-sys.path.append("onionr/")
+sys.path.append("src/")
 import unittest, uuid
 
 TEST_DIR = 'testdata/%s-%s' % (uuid.uuid4(), os.path.basename(__file__)) + '/'
diff --git a/tests/test_stringvalidations.py b/tests/test_stringvalidations.py
index dd1bb3ad..8321674d 100755
--- a/tests/test_stringvalidations.py
+++ b/tests/test_stringvalidations.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 import sys, os
 sys.path.append(".")
-sys.path.append("onionr/")
+sys.path.append("src/")
 import unittest, uuid
 TEST_DIR = 'testdata/%s-%s' % (uuid.uuid4(), os.path.basename(__file__)) + '/'
 print("Test directory:", TEST_DIR)
diff --git a/tests/test_upload_session.py b/tests/test_upload_session.py
index d05f43b6..ba32bb2e 100644
--- a/tests/test_upload_session.py
+++ b/tests/test_upload_session.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 import sys, os
 sys.path.append(".")
-sys.path.append("onionr/")
+sys.path.append("src/")
 import unittest, uuid
 TEST_DIR = 'testdata/%s-%s' % (uuid.uuid4(), os.path.basename(__file__)) + '/'
 print("Test directory:", TEST_DIR)
diff --git a/tests/test_vanity.py b/tests/test_vanity.py
index cb294780..f7ec76db 100644
--- a/tests/test_vanity.py
+++ b/tests/test_vanity.py
@@ -1,6 +1,6 @@
 import sys, os
 sys.path.append(".")
-sys.path.append("onionr/")
+sys.path.append("src/")
 import unittest
 import vanityonionr
 
diff --git a/tests/test_waitforsetvars.py b/tests/test_waitforsetvars.py
index 76bbb724..c2e276a2 100644
--- a/tests/test_waitforsetvars.py
+++ b/tests/test_waitforsetvars.py
@@ -1,6 +1,6 @@
 import sys, os
 sys.path.append(".")
-sys.path.append("onionr/")
+sys.path.append("src/")
 import unittest, uuid, time, threading
 
 TEST_DIR = 'testdata/%s-%s' % (uuid.uuid4(), os.path.basename(__file__)) + '/'
diff --git a/tests/test_zfill.py b/tests/test_zfill.py
index 2fb4471b..d706f1e5 100644
--- a/tests/test_zfill.py
+++ b/tests/test_zfill.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 import unittest, sys
 sys.path.append(".")
-sys.path.append("onionr/")
+sys.path.append("src/")
 
 from utils import reconstructhash