diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 81e855b..797a6c1 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -17,6 +17,7 @@ jobs:
   steps:
   # TODO: Uncomment both this and 'publish-build-cache' below to enable build caching for Linux.
   # - template: .ci/restore-build-cache.yml
+  - script: sudo apt-get install -y fish
   - script: .ci/create-static-binary.sh
   - script: ./feature_tests/run.sh $(pwd)/fnm-linux
   # - script: bash .ci/prepare-static-build.sh
@@ -40,6 +41,7 @@ jobs:
   steps:
   # TODO: Uncomment both this and 'publish-build-cache' below to enable build caching for Mac.
   # - template: .ci/restore-build-cache.yml
+  - script: brew install fish
   - template: .ci/esy-build-steps.yml
   - script: cp _build/default/executable/FnmApp.exe _build/fnm
   - script: ./feature_tests/run.sh $(pwd)/_build/fnm
diff --git a/feature_tests/fish/run.fish b/feature_tests/fish/run.fish
new file mode 100644
index 0000000..2dad2e8
--- /dev/null
+++ b/feature_tests/fish/run.fish
@@ -0,0 +1,10 @@
+#!/usr/bin/env fish
+
+eval (fnm env --fish)
+fnm install v8.11.3
+fnm use v8.11.3
+
+if test (node --version) != "v8.11.3"
+  echo "Node version is not v8.11.3!"
+  exit 1
+end
diff --git a/feature_tests/fish/run.sh b/feature_tests/fish/run.sh
new file mode 100755
index 0000000..df4a3ec
--- /dev/null
+++ b/feature_tests/fish/run.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+DIRECTORY=`dirname $0`
+
+if hash fish 2>/dev/null; then
+  fish $DIRECTORY/run.fish
+else
+  echo "Skipping: \`fish\` is not installed"
+fi