diff --git a/.cirrus.yml b/.cirrus.yml
index b6b809a7..e724321b 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -131,6 +131,8 @@ task:
     apt-get -y install wget expect-dev dejagnu python-sphinx bash tcsh ksh zsh fish tcl tcl8.6 perl python ruby cmake r-base-core
     # libtclenvmodules build requirements
     apt-get -y install gcc autoconf tcl8.6-dev
+    # remove snapd file that breaks fish shell on bionic (see https://bugs.launchpad.net/ubuntu/+source/snapd/+bug/1961365)
+    rm -f /usr/share/fish/vendor_conf.d/snapd.fish
   configure_script:
     - ./configure --with-tclsh=tclsh8.6 --prefix /tmp/modules --with-tcl=/usr/lib/tcl8.6 --enable-append-manpath --enable-append-binpath --with-bin-search-path=/usr/bin:/bin --enable-silent-shell-debug-support --enable-windows-support --with-loadedmodules=null:dot --enable-quarantine-support --with-quarantine-vars=LD_LIBRARY_PATH --with-dark-background-colors='hi=1:se=2:er=91:wa=93:mp=1;94:di=94:al=96:sy=95' --enable-foo FOO=bar
   << : *BUILD_INSTALL_TEST_TEMPLATE
diff --git a/.github/workflows/linux_tests.yaml b/.github/workflows/linux_tests.yaml
index 31aee606..605e266f 100644
--- a/.github/workflows/linux_tests.yaml
+++ b/.github/workflows/linux_tests.yaml
@@ -27,6 +27,8 @@ jobs:
           sudo apt-get install -y xvfb
           # need to fix gems on bionic to avoid warning messages that broke output checks
           sudo gem update --system 3.0.8
+          # remove snapd file that breaks fish shell on bionic (see https://bugs.launchpad.net/ubuntu/+source/snapd/+bug/1961365)
+          rm -f /usr/share/fish/vendor_conf.d/snapd.fish
       - name: Build Modules
         run: |
           ./configure $CONFIGURE_OPTS
@@ -79,6 +81,8 @@ jobs:
           sudo apt-get install -y gcc autoconf tcl8.5-dev 
           # need to fix gems on xenial to avoid warning messages that broke output checks
           sudo gem update --system 3.0.8
+          # remove snapd file that breaks fish shell on bionic (see https://bugs.launchpad.net/ubuntu/+source/snapd/+bug/1961365)
+          rm -f /usr/share/fish/vendor_conf.d/snapd.fish
       - name: Build Modules
         run: |
           ./configure $CONFIGURE_OPTS
@@ -131,6 +135,8 @@ jobs:
           sudo apt-get install -y gcc autoconf tcl8.5-dev 
           # need to fix gems on bionic to avoid warning messages that broke output checks
           sudo gem update --system 3.0.8
+          # remove snapd file that breaks fish shell on bionic (see https://bugs.launchpad.net/ubuntu/+source/snapd/+bug/1961365)
+          rm -f /usr/share/fish/vendor_conf.d/snapd.fish
       - name: Build Modules
         run: |
           ./configure $CONFIGURE_OPTS
@@ -185,6 +191,8 @@ jobs:
           sudo apt-get install -y gcc autoconf tcl8.6-dev 
           # need to fix gems on bionic to avoid warning messages that broke output checks
           sudo gem update --system 3.0.8
+          # remove snapd file that breaks fish shell on bionic (see https://bugs.launchpad.net/ubuntu/+source/snapd/+bug/1961365)
+          rm -f /usr/share/fish/vendor_conf.d/snapd.fish
       - name: Build Modules
         run: |
           ./configure $CONFIGURE_OPTS
@@ -239,6 +247,8 @@ jobs:
           sudo apt-get install -y gcc autoconf tcl8.5-dev 
           # need to fix gems on xenial to avoid warning messages that broke output checks
           sudo gem update --system 3.0.8
+          # remove snapd file that breaks fish shell on bionic (see https://bugs.launchpad.net/ubuntu/+source/snapd/+bug/1961365)
+          rm -f /usr/share/fish/vendor_conf.d/snapd.fish
       - name: Build Modules
         run: |
           ./configure $CONFIGURE_OPTS