diff --git a/files/docker/systemctl.py b/files/docker/systemctl.py
index d703038e..46f30da7 100755
--- a/files/docker/systemctl.py
+++ b/files/docker/systemctl.py
@@ -2148,9 +2148,9 @@ def read_env_part(self, env_part): # -> generate[ (name, value) ]
         try:
             for real_line in env_part.split("\n"):
                 line = real_line.strip()
-                for found in re.finditer(r'\s*("[\w_]+=[^"]*"|[\w_]+=\S*)', line):
+                for found in re.finditer(r'\s*("[\w_]+=[^"]*"|\'[\w_]+=[^\']*\'|[\w_]+=\S*)', line):
                     part = found.group(1)
-                    if part.startswith('"'):
+                    if part.startswith('"') or part.startswith("'"):
                         part = part[1:-1]
                     name, value = part.split("=", 1)
                     yield name, value
diff --git a/files/docker/systemctl3.py b/files/docker/systemctl3.py
index 6c578c05..624777f8 100755
--- a/files/docker/systemctl3.py
+++ b/files/docker/systemctl3.py
@@ -2148,9 +2148,9 @@ def read_env_part(self, env_part): # -> generate[ (name, value) ]
         try:
             for real_line in env_part.split("\n"):
                 line = real_line.strip()
-                for found in re.finditer(r'\s*("[\w_]+=[^"]*"|[\w_]+=\S*)', line):
+                for found in re.finditer(r'\s*("[\w_]+=[^"]*"|\'[\w_]+=[^\']*\'|[\w_]+=\S*)', line):
                     part = found.group(1)
-                    if part.startswith('"'):
+                    if part.startswith('"') or part.startswith("'"):
                         part = part[1:-1]
                     name, value = part.split("=", 1)
                     yield name, value
diff --git a/testsuite.py b/testsuite.py
index 1d369550..bb7db54e 100755
--- a/testsuite.py
+++ b/testsuite.py
@@ -2744,7 +2744,7 @@ def test_2148_show_environment_from_some_bad_parts(self, real: bool = False) ->
         self.coverage()
     def test_2150_have_environment_with_multiple_parts(self) -> None:
         """ check that the result of 'environment UNIT' can
-            list the assignements that are crammed into one line."""
+            list the assignments that are crammed into one line."""
         # https://www.freedesktop.org/software/systemd/man/systemd.exec.html#Environment=
         testname = self.testname()
         testdir = self.testdir()
@@ -2760,9 +2760,12 @@ def test_2150_have_environment_with_multiple_parts(self) -> None:
             Description=Testing B
             [Service]
             EnvironmentFile=/etc/sysconfig/zzb.conf
-            Environment="VAR1=word1 word2" VAR2=word3 "VAR3=$word 5 6"
+            Environment="VAR1=word1 word2" VAR2=word3 "VAR3=$word 5 6" 'VAR4=7 8'
+            Environment='VAR5='
+            Environment='VAR6=9 10'
             ExecStart=/usr/bin/printf $DEF1 $DEF2 \
-                                $VAR1 $VAR2 $VAR3
+                                $VAR1 $VAR2 $VAR3 \
+                                $VAR4 $VAR5
             [Install]
             WantedBy=multi-user.target""")
         cmd = "{systemctl} environment zzb.service -vv"
@@ -2775,6 +2778,9 @@ def test_2150_have_environment_with_multiple_parts(self) -> None:
         self.assertTrue(greps(out, r"^VAR1=word1 word2"))
         self.assertTrue(greps(out, r"^VAR2=word3"))
         self.assertTrue(greps(out, r"^VAR3=\$word 5 6"))
+        self.assertTrue(greps(out, r"^VAR4=7 8"))
+        self.assertTrue(greps(out, r"^VAR5="))
+        self.assertTrue(greps(out, r"^VAR6=9 10"))
         a_lines = len(lines(out))
         #
         self.rm_testdir()