diff --git a/lib/galaxy/tools/evaluation.py b/lib/galaxy/tools/evaluation.py
index c0d9765e036..5abc925dc6e 100644
--- a/lib/galaxy/tools/evaluation.py
+++ b/lib/galaxy/tools/evaluation.py
@@ -684,7 +684,7 @@ class RemoteToolEvaluator(ToolEvaluator):
     def __init__(self, app, tool, job, local_working_directory, job_io: JobIO):
         super().__init__(app, tool, job, local_working_directory)
         self.job_io = job_io
-        self._compute_environment = None
+        self._compute_environment: Optional[SharedComputeEnvironment] = None
 
     @property
     def compute_environment(self):
diff --git a/test/unit/app/tools/test_metadata.py b/test/unit/app/tools/test_metadata.py
index 19c09ae2247..25240d43798 100644
--- a/test/unit/app/tools/test_metadata.py
+++ b/test/unit/app/tools/test_metadata.py
@@ -179,10 +179,10 @@ class MetadataTestCase(unittest.TestCase, tools_support.UsesTools):
     def _write_job_files(self, stdout="tool stdout", stderr="tool stderr"):
         with open(os.path.join(self.job_working_directory, "tool_script.sh"), 'w') as f:
             f.write("echo hi")
-        with open(os.path.join(self.job_working_directory, "tool_stdout"), "wb") as f:
-            f.write(stdout.encode("utf-8"))
-        with open(os.path.join(self.job_working_directory, "tool_stderr"), "wb") as f:
-            f.write(stderr.encode("utf-8"))
+        with open(os.path.join(self.job_working_directory, "tool_stdout"), "w") as f:
+            f.write(stdout)
+        with open(os.path.join(self.job_working_directory, "tool_stderr"), "w") as f:
+            f.write(stderr)
 
     def metadata_command(self, output_datasets, output_collections=None):
         output_collections = output_collections or {}