diff --git a/.buildbot/z13.sh b/.buildbot/z13.sh
index 2e2f01b..c4757d0 100755
--- a/.buildbot/z13.sh
+++ b/.buildbot/z13.sh
@@ -72,4 +72,4 @@ cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_PATH} .. \
 make -j$(nproc)
 make -j$(nproc) check-onnx-lit
 make -j$(nproc) check-onnx-backend
-PATH=$(pwd)/bin:$PATH make -j$(nproc) test
+make -j$(nproc) test
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1b97883..9ccba31 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -47,7 +47,7 @@ jobs:
             cd onnx-mlir/build
             # Need to include the bin directory in $PATH,
             # otherwise CTest fails to find the test executables.
-            RUNTIME_DIR=$(pwd)/lib PATH=$(pwd)/bin:$PATH make test -j$(nproc)
+            RUNTIME_DIR=$(pwd)/lib make test -j$(nproc)
       - run:
           name: Run DocCheck
           command: cd onnx-mlir/build && cmake --build . --target check-doc
diff --git a/.gitmodules b/.gitmodules
index 5305d49..5bdc35e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,7 +3,10 @@
 	url = https://github.com/onnx/onnx.git
 [submodule "third_party/benchmark"]
 	path = third_party/benchmark
-	url = https://github.com/tjingrant/google-benchmark.git
+	url = https://github.com/google/benchmark.git
+[submodule "third_party/googletest"]
+	path = third_party/googletest
+	url = https://github.com/google/googletest.git
 [submodule "third_party/pybind11"]
 	path = third_party/pybind11
 	url = https://github.com/pybind/pybind11.git
diff --git a/.travis.yml b/.travis.yml
index 2afa0a3..525852a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,11 +34,13 @@ script:
   - df -h
   - docker cp $(pwd) build:/build/onnx-mlir
   - cd docker
-  - chmod a+x compile-onnx-mlir.sh
+  - chmod a+x compile-onnx-mlir.sh test-onnx-mlir.sh
   - docker cp compile-onnx-mlir.sh build:/usr/bin/compile-onnx-mlir.sh
+  - docker cp test-onnx-mlir.sh build:/usr/bin/test-onnx-mlir.sh
   - echo "about to execute build inside docker"
   - docker exec build df -h
   - docker exec build compile-onnx-mlir.sh
+  - docker exec build test-onnx-mlir.sh
   - docker commit build onnxmlirczar/onnx-mlir-build:$CPU_ARCH
 after_success: 
   - if [ $TRAVIS_PULL_REQUEST == false ] && [ $TRAVIS_BRANCH == "master" ] && [ $NIGHTLY == false ]; then
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 28e552c..16106e0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,6 +27,7 @@ if (MSVC)
   set(CMAKE_CXX_FLAGS "-wd4244 -wd4267 -wd4530 -wd4624")
 endif()
 add_subdirectory(third_party/onnx)
+add_subdirectory(third_party/googletest)
 add_subdirectory(third_party/benchmark)
 add_subdirectory(third_party/pybind11)
 add_subdirectory(third_party/variant)
diff --git a/docker/test-onnx-mlir.sh b/docker/test-onnx-mlir.sh
new file mode 100644
index 0000000..20d9df9
--- /dev/null
+++ b/docker/test-onnx-mlir.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+pwd
+ls -al
+
+# Install prereqs
+pip install -e onnx-mlir/third_party/onnx
+
+cd onnx-mlir/build
+
+# Run end-to-end tests:
+cmake --build . --target check-onnx-backend
+
+# Run unit tests:
+cmake --build .
+cmake --build . --target test
diff --git a/third_party/benchmark b/third_party/benchmark
index b57c113..1302d2c 160000
--- a/third_party/benchmark
+++ b/third_party/benchmark
@@ -1 +1 @@
-Subproject commit b57c11391d9c749d6ef2b6139a339acac69bbb76
+Subproject commit 1302d2ce094a9753b0f81a81ea74c0fa71fae582
diff --git a/third_party/googletest b/third_party/googletest
new file mode 160000
index 0000000..3af06fe
--- /dev/null
+++ b/third_party/googletest
@@ -0,0 +1 @@
+Subproject commit 3af06fe1664d30f98de1e78c53a7087e842a2547