diff --git a/Exscript/protocols/drivers/junos.py b/Exscript/protocols/drivers/junos.py
index bcadda09..ea58f4af 100644
--- a/Exscript/protocols/drivers/junos.py
+++ b/Exscript/protocols/drivers/junos.py
@@ -55,7 +55,7 @@
 _re_re = r'(?:' + _mb + r'|' + _ps + r')'
 _edit = r'(?:\[edit[^\]\r\n]*\])'
 _prefix = r'(?:[\r\n]+' + _re_re + r'?' + _edit + r'?)'
-_prompt = r'[\r\n]+[\w\-\.]+@[\-\w+\.:]+[%>#] $'
+_prompt = r'[\r\n]+[\w\-\.]+@[\-\w+\.:]+[~]?[\s%>#]+$'
 _prompt_re = [re.compile(_prefix + r'?' + _prompt)]
 _error_re = [re.compile(r'^(unknown|invalid|error|syntax error)', re.I)]
 _junos_re = re.compile(r'\bjunos\b', re.I)
diff --git a/tests/Exscript/protocols/banners/junos.4 b/tests/Exscript/protocols/banners/junos.4
new file mode 100644
index 00000000..dba38bf1
--- /dev/null
+++ b/tests/Exscript/protocols/banners/junos.4
@@ -0,0 +1,4 @@
+Password:
+Last login: Mon Sep 14 17:57:32 2020 from (x.x.x.x)
+--- JUNOS 18.4R3.3 Kernel 64-bit  JNPR-11.0-20191211.fa5e90e_buil
+root@testhost:~ #