diff --git a/programming/c++/gtest/Makefile b/programming/c++/gtest/Makefile
index 8ddcf66..d3844a6 100644
--- a/programming/c++/gtest/Makefile
+++ b/programming/c++/gtest/Makefile
@@ -2,13 +2,15 @@ PROGS+=	disabled_demo
 PROGS+=	expect_nonfatal_failure_demo
 PROGS+=	fixture_fail_demo
 PROGS+=	pass_fail_demo
-PROGS+=	setup_environment_fail_demo
+PROGS+=	setup_environment_fatal_fail_demo
+PROGS+=	setup_environment_nonfatal_fail_demo
+PROGS+=	setup_environment_skip_demo
 PROGS+=	skip_demo
 PROGS+=	teardown_environment_fail_demo
 
 CXXFLAGS+=	-Werror -W -Wall -Wunused
 CXXFLAGS+=	-std=c++11
-CXXFLAGS+=	-DGTEST_HAS_PTHREAD=1 -DGTEST_IS_THREADSAFE=1
+CXXFLAGS+=	-DGTEST_HAS_PTHREAD=1
 CXXFLAGS+=	-DGTEST_LINKED_AS_SHARED_LIBRARY=1
 
 ifdef GITDIR
diff --git a/programming/c++/gtest/setup_environment_fail_demo.cc b/programming/c++/gtest/setup_environment_fail_demo.cc
deleted file mode 100644
index db04aeb..0000000
--- a/programming/c++/gtest/setup_environment_fail_demo.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <gtest/gtest.h>
-
-class SetupEnvironment : public ::testing::Environment
-{
-public:
-  void SetUp() { EXPECT_EQ(false, true); };
-};
-
-TEST(Test, AlwaysPasses) {
-  EXPECT_EQ(true, true);
-}
-
-int
-main(int argc, char *argv[]) {
-  ::testing::InitGoogleTest(&argc, argv);
-  testing::AddGlobalTestEnvironment(new SetupEnvironment());
-  return RUN_ALL_TESTS();
-}
diff --git a/programming/c++/gtest/setup_environment_fatal_fail_demo.cc b/programming/c++/gtest/setup_environment_fatal_fail_demo.cc
new file mode 100644
index 0000000..f8bb80d
--- /dev/null
+++ b/programming/c++/gtest/setup_environment_fatal_fail_demo.cc
@@ -0,0 +1,24 @@
+#include <gtest/gtest.h>
+
+class SetupEnvironment : public testing::Environment {
+public:
+  void SetUp() override {
+    GTEST_FAIL() << "Calling a fatal failure";
+  }
+};
+
+TEST(Test, AlwaysPasses) {
+  EXPECT_EQ(true, true);
+}
+
+TEST(Test, AlwaysFails) {
+  EXPECT_EQ(true, false);
+}
+
+int main(int argc, char **argv) {
+  testing::InitGoogleTest(&argc, argv);
+
+  testing::AddGlobalTestEnvironment(new SetupEnvironment());
+
+  return (RUN_ALL_TESTS());
+}
diff --git a/programming/c++/gtest/setup_environment_nonfatal_fail_demo.cc b/programming/c++/gtest/setup_environment_nonfatal_fail_demo.cc
new file mode 100644
index 0000000..38dcad8
--- /dev/null
+++ b/programming/c++/gtest/setup_environment_nonfatal_fail_demo.cc
@@ -0,0 +1,24 @@
+#include <gtest/gtest.h>
+
+class SetupEnvironment : public ::testing::Environment {
+public:
+  void SetUp() override {
+    EXPECT_EQ(false, true);
+  }
+};
+
+TEST(Test, AlwaysPasses) {
+  EXPECT_EQ(true, true);
+}
+
+TEST(Test, AlwaysFails) {
+  EXPECT_EQ(true, false);
+}
+
+int main(int argc, char **argv) {
+  testing::InitGoogleTest(&argc, argv);
+
+  testing::AddGlobalTestEnvironment(new SetupEnvironment());
+
+  return RUN_ALL_TESTS();
+}
diff --git a/programming/c++/gtest/setup_environment_skip_demo.cc b/programming/c++/gtest/setup_environment_skip_demo.cc
new file mode 100644
index 0000000..a1593e6
--- /dev/null
+++ b/programming/c++/gtest/setup_environment_skip_demo.cc
@@ -0,0 +1,24 @@
+#include <gtest/gtest.h>
+
+class SetupEnvironment : public testing::Environment {
+public:
+  void SetUp() override {
+    GTEST_SKIP() << "Skipping the entire environment";
+  }
+};
+
+TEST(Test, AlwaysPasses) {
+  EXPECT_EQ(true, true);
+}
+
+TEST(Test, AlwaysFails) {
+  EXPECT_EQ(true, false);
+}
+
+int main(int argc, char **argv) {
+  testing::InitGoogleTest(&argc, argv);
+
+  testing::AddGlobalTestEnvironment(new SetupEnvironment());
+
+  return (RUN_ALL_TESTS());
+}