diff --git a/kibot/kicad/config.py b/kibot/kicad/config.py
index 2d5f9cfe..0207f8ea 100644
--- a/kibot/kicad/config.py
+++ b/kibot/kicad/config.py
@@ -178,7 +178,10 @@ class KiConf(object):
         return None
 
     def guess_symbol_dir():
-        return KiConf.guess_kicad_data_dir('library', 'KICAD_SYMBOL_DIR')
+        guess = KiConf.guess_kicad_data_dir('library', 'KICAD_SYMBOL_DIR')
+        if guess is None:
+            guess = KiConf.guess_kicad_data_dir('symbols', 'KICAD_SYMBOL_DIR')
+        return guess
 
     def guess_3d_dir():
         return KiConf.guess_kicad_data_dir(os.path.join('modules', 'packages3d'), 'KISYS3DMOD')
diff --git a/tests/test_plot/test_kicad_config_errors.py b/tests/test_plot/test_kicad_config_errors.py
index a9e82911..f7f91389 100644
--- a/tests/test_plot/test_kicad_config_errors.py
+++ b/tests/test_plot/test_kicad_config_errors.py
@@ -101,7 +101,7 @@ def test_kicad_conf_guess_libs(monkeypatch):
     """ Check no HOME and fail to load kicad_common.
         Also check we correctly guess the libs dir. """
     res = check_load_conf(fail=True, no_conf_path=True)
-    assert 'Detected KICAD_SYMBOL_DIR="/usr/share/kicad/library"' in res, res
+    assert 'Detected KICAD_SYMBOL_DIR="/usr/share/kicad/' in res, res
 
 
 def test_kicad_conf_lib_env(monkeypatch):
@@ -148,7 +148,8 @@ def test_kicad_conf_local_conf(monkeypatch):
     with monkeypatch.context() as m:
         m.setattr("sysconfig.get_path", mocked_get_path_1)
         with context.cover_it(cov):
-            assert KiConf.guess_symbol_dir() == '/usr/share/kicad/library'
+            assert (KiConf.guess_symbol_dir() == '/usr/share/kicad/library' or
+                    KiConf.guess_symbol_dir() == '/usr/share/kicad/symbols')
 
 
 def test_kicad_conf_no_conf():