diff --git a/newrelic/admin/run_program.py b/newrelic/admin/run_program.py
index d09c27e094..d98840ea4d 100644
--- a/newrelic/admin/run_program.py
+++ b/newrelic/admin/run_program.py
@@ -99,17 +99,18 @@ def log_message(text, *args):
     # be found in current working directory even though '.'
     # not in PATH.
 
-    program_exe_path = Path(args[0])
+    program_exe_path = args[0]
 
-    if not program_exe_path.parent:
+    # Don't use path.parent, as it can't distinguish between ./ and no parent.
+    if not os.path.dirname(program_exe_path):  # noqa: PTH120
         program_search_path = os.environ.get("PATH", "").split(os.pathsep)
         for path in program_search_path:
             path = Path(path) / program_exe_path
             if path.exists() and os.access(path, os.X_OK):
-                program_exe_path = path
+                program_exe_path = str(path)  # Convert to str to match other code path
                 break
 
-    log_message("program_exe_path = %r", str(program_exe_path))
+    log_message("program_exe_path = %r", program_exe_path)
     log_message("execl_arguments = %r", [program_exe_path, *args])
 
     os.execl(program_exe_path, *args)  # noqa: S606
diff --git a/newrelic/admin/run_python.py b/newrelic/admin/run_python.py
index 411b19ee80..016ae16a2b 100644
--- a/newrelic/admin/run_python.py
+++ b/newrelic/admin/run_python.py
@@ -96,15 +96,17 @@ def log_message(text, *args):
     # this script in preference to that used to execute this
     # script.
 
-    bin_directory = Path(sys.argv[0]).parent
+    argv_executable = sys.argv[0]
 
+    # Don't use path.parent, as it can't distinguish between ./ and no parent.
+    bin_directory = os.path.dirname(argv_executable)  # noqa: PTH120
     if bin_directory:
         python_exe = Path(sys.executable).name
-        python_exe_path = bin_directory / python_exe
+        python_exe_path = Path(bin_directory) / python_exe
         if not python_exe_path.exists() or not os.access(python_exe_path, os.X_OK):
-            python_exe_path = sys.executable
+            python_exe_path = Path(sys.executable)
     else:
-        python_exe_path = sys.executable
+        python_exe_path = Path(sys.executable)
 
     log_message("python_exe_path = %r", str(python_exe_path))
     log_message("execl_arguments = %r", [python_exe_path, python_exe_path, *args])
diff --git a/setup.py b/setup.py
index 5d8bbf7b14..f79202676e 100644
--- a/setup.py
+++ b/setup.py
@@ -84,8 +84,6 @@ def newrelic_agent_next_version(version):
 
 
 script_directory = Path(__file__).parent
-if not script_directory:
-    script_directory = Path(os.getcwd())
 
 readme_file = script_directory / "README.md"
 with readme_file.open() as f: