diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 38499863..9f96ead8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,24 @@
 gcc-c++11:
   script: "CI/ci-linux.sh gcc C++11"
+  tags:
+    - Linux
 
 clang-c++11:
   script: "CI/ci-linux.sh clang C++11"
+  tags:
+    - Linux
 
 gcc-c++98:
   script: "CI/ci-linux.sh gcc C++98"
+  tags:
+    - Linux
 
 clang-c++98:
   script: "CI/ci-linux.sh clang C++98"
+  tags: 
+    - Linux
 
+macos:
+  script: "CI/ci-mac.sh"
+  tags:
+    - Apple
diff --git a/CI/ci-linux.sh b/CI/ci-linux.sh
index 7af6bdee..30a08372 100755
--- a/CI/ci-linux.sh
+++ b/CI/ci-linux.sh
@@ -3,8 +3,6 @@
 COMPILER=$1
 LANGUAGE=$2
 
-#!/bin/bash
-
 OPTIONS=""
 
 if [ "$COMPILER" == "gcc" ]; then
diff --git a/CI/ci-mac.sh b/CI/ci-mac.sh
new file mode 100755
index 00000000..27772cb5
--- /dev/null
+++ b/CI/ci-mac.sh
@@ -0,0 +1,62 @@
+#!/bin/bash
+
+PATH=$PATH:/opt/local/bin
+export PATH
+
+#########################################
+# Build release version
+#########################################
+
+if [ ! -d build-release ]; then
+  mkdir build-release
+fi
+
+cd build-release
+
+cmake -DCMAKE_BUILD_TYPE=Release -DOPENMESH_BUILD_UNIT_TESTS=TRUE ../
+
+#build it
+make
+
+#build the unit tests
+make unittests
+
+
+#########################################
+# Run Release Unittests
+#########################################
+cd Unittests
+
+#execute tests
+./unittests --gtest_color=yes --gtest_output=xml
+
+cd ..
+cd ..
+
+
+#########################################
+# Build Debug version and Unittests
+#########################################
+
+if [ ! -d build-debug ]; then
+  mkdir build-debug
+fi
+
+cd build-debug
+
+cmake -DCMAKE_BUILD_TYPE=Debug -DOPENMESH_BUILD_UNIT_TESTS=TRUE ../
+
+#build the unit tests
+make unittests
+
+
+#########################################
+# Run Debug Unittests
+#########################################
+
+cd Unittests
+
+# Run the unittests
+./unittests --gtest_color=yes --gtest_output=xml
+
+