diff --git a/Dockerfile.x86_64 b/Dockerfile.x86_64
index c268ca4..bb4d8fb 100644
--- a/Dockerfile.x86_64
+++ b/Dockerfile.x86_64
@@ -5,6 +5,8 @@ ARG DEBIAN_FRONTEND=noninteractive
 ARG HEY_URL=https://hey-release.s3.us-east-2.amazonaws.com/hey_linux_amd64
 ARG WASI_SDK_URL=https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-8/wasi-sdk_8.0_amd64.deb
 ARG WASMCEPTION_URL=https://github.com/gwsystems/wasmception/releases/download/v0.2.0/wasmception-linux-x86_64-0.2.0.tar.gz
+ARG SHFMT_URL=https://github.com/mvdan/sh/releases/download/v3.2.4/shfmt_v3.2.4_linux_amd64
+ARG SHELLCHECK_URL=https://github.com/koalaman/shellcheck/releases/download/v0.7.1/shellcheck-v0.7.1.linux.x86_64.tar.xz
 
 # General GCC C/C++ Build toolchain
 # pkg-config, libtool - used by PocketSphinx
@@ -31,9 +33,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 
 # Test Script Stuff
 RUN apt-get update && apt-get install -y --no-install-recommends \
+	bc \
 	fonts-dejavu \
 	fonts-cascadia-code \
 	fonts-roboto \
+	gnuplot \
 	imagemagick \
 	netpbm \
 	pango1.0-tools \
@@ -44,14 +48,19 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 # See https://github.com/rakyll/hey
 RUN wget $HEY_URL -O hey && chmod +x hey && mv hey /usr/bin/hey
 
+# shfmt is a formatter for shell scripts
+RUN wget $SHFMT_URL -O shfmt && chmod +x shfmt && mv shfmt /usr/local/bin/shfmt
+RUN wget $SHELLCHECK_URL -O shellcheck && chmod +x shellcheck && mv shellcheck /usr/local/bin/shellcheck
+
 # Interactive Tools
 RUN apt-get update && apt-get install -y --no-install-recommends \
-	bc \
 	bsdmainutils \
-	less \
 	gdb \
+	less \
+	openssh-client \
 	strace \
-	vim
+	vim \
+	wabt
 
 ENV LLVM_VERSION=8
 ADD install_llvm.sh /sledge/install_llvm.sh