diff --git a/litex/build/xilinx/vivado.py b/litex/build/xilinx/vivado.py
index 424cb1fb5..4d9a8d2b8 100644
--- a/litex/build/xilinx/vivado.py
+++ b/litex/build/xilinx/vivado.py
@@ -59,6 +59,8 @@ def _run_vivado(build_name, vivado_path, source, ver=None):
         r = subprocess.call([build_script_file])
     else:
         build_script_contents = "# Autogenerated by LiteX\nset -e\n"
+        if vivado_path is None:
+            vivado_path = "/opt/Xilinx/Vivado"
         settings = common.settings(vivado_path, ver)
         build_script_contents += "source " + settings + "\n"
         build_script_contents += "vivado -mode batch -source " + build_name + ".tcl\n"
@@ -112,7 +114,7 @@ class XilinxVivadoToolchain:
         tools.write_to_file(build_name + ".tcl", "\n".join(tcl))
 
     def build(self, platform, fragment, build_dir="build", build_name="top",
-            toolchain_path="/opt/Xilinx/Vivado", source=True, run=True, **kwargs):
+            toolchain_path=None, source=True, run=True, **kwargs):
         tools.mkdir_noerror(build_dir)
         cwd = os.getcwd()
         os.chdir(build_dir)