diff --git a/.smalltalk.ston b/.smalltalk.ston
new file mode 100644
index 00000000..b99b6c9e
--- /dev/null
+++ b/.smalltalk.ston
@@ -0,0 +1,18 @@
+SmalltalkCISpec {
+  #name : 'Metacello',
+  #loading : [
+    SCIMetacelloLoadSpec {
+      #baseline : 'Seaside3',
+      #directory : 'repository',
+     	#load : [ 'CI' ],
+      #onWarningLog : true,
+      #useLatestMetacello : false,
+      #platforms : [ #gemstone ]
+    }
+  ],
+  #testing : {
+    #include : {
+      #classes : [ #SentButNotImplementedTest, #UndefinedSymbolsTest ]
+    }
+  }
+}
diff --git a/.travis.yml b/.travis.yml
index 0e1b9171..7ce9a549 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,31 +1,18 @@
-language: erlang
+language: smalltalk
+sudo: false
 
-notifications:
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/c59e6bffa0b41a693676 # GsDevKit/chat (public)
-    on_success: always # options: [always|never|change] default: always
-    on_failure: always  # options: [always|never|change] default: always
-    on_start: false     # default: false
+os: linux
 
-env:
+smalltalk:
+  - GemStone-2.4.8
+  - GemStone-3.1.0.6
+  - GemStone-3.2.17
+  - GemStone-3.3.9
+  - GemStone-3.4.3
 
-   # standard load
-   - ST=GemStone-3.1.0.6   BASELINE=Seaside3 LOADS="'CI' 'Swazoo' 'Zinc' 'FastCGI'" REPOSITORY="filetree://${TRAVIS_BUILD_DIR}/repository"
-   - ST=GemStone-3.2.17    BASELINE=Seaside3 LOADS="'CI' 'Swazoo' 'Zinc' 'FastCGI'" REPOSITORY="filetree://${TRAVIS_BUILD_DIR}/repository"
-   - ST=GemStone-3.3.9     BASELINE=Seaside3 LOADS="'CI' 'Swazoo' 'Zinc' 'FastCGI'" REPOSITORY="filetree://${TRAVIS_BUILD_DIR}/repository"
-   - ST=GemStone-3.4.3     BASELINE=Seaside3 LOADS="'CI' 'Swazoo' 'Zinc' 'FastCGI'" REPOSITORY="filetree://${TRAVIS_BUILD_DIR}/repository"
-   # whole enchilada
-   - ST=GemStone-3.3.9     BASELINE=Seaside3 LOADS="'ALL'" REPOSITORY="filetree://${TRAVIS_BUILD_DIR}/repository"
-   - ST=GemStone-3.4.3     BASELINE=Seaside3 LOADS="'ALL'" REPOSITORY="filetree://${TRAVIS_BUILD_DIR}/repository"
-install:
-   - export PROJECT_HOME="$(pwd)"
-   - cd $HOME
-   - wget -q -O builderCI.zip https://github.com/dalehenrich/builderCI/zipball/master
-   - unzip -q builderCI.zip
-   - cd dalehenrich-builderCI*
-   - source build_env_vars
-   - ln -s $PROJECT_HOME $GIT_PATH
-   - ./build_image.sh
+smalltalk_config:
+  - .smalltalk.ston
 
-script: $PROJECT_HOME/tests/testTravisCI.sh -verbose
+cache:
+  directories:
+    - $SMALLTALK_CI_CACHE
diff --git a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselineadaptors..st b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselineadaptors..st
index 1288d084..3b525b2d 100644
--- a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselineadaptors..st
+++ b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselineadaptors..st
@@ -95,13 +95,13 @@ baselineadaptors: spec
               spec
                 loads: 'Core';
                 repository:
-                    'github://GsDevKit/gsApplicationTools:v1.?/repository' ];
+                    'github://GsDevKit/gsApplicationTools:master/repository' ];
         baseline: 'Zinc Project'
           with: [ 
               spec
                 className: 'BaselineOfZincHTTPComponents';
                 loads: #('Zinc-HTTP' 'Core');
-                repository: 'github://GsDevKit/zinc:v2.4.3.?/repository' ];
+                repository: 'github://GsDevKit/zinc:gs_master/repository' ];
         yourself.
       spec
         package: 'Seaside-GemStone-GemServer-Core'
@@ -127,4 +127,4 @@ baselineadaptors: spec
       spec
         group: 'FastCGI' with: #('Seaside-Adaptors-FastCGI');
         group: 'Tests' with: #('Seaside-GemStone-GemServer-Tests');
-        yourself ]
\ No newline at end of file
+        yourself ]