diff --git a/.gitignore b/.gitignore
index 41d2b80..94cab06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,5 +10,6 @@ dist
 download
 eggs
 fake-eggs
+local.cfg
 parts
 var
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..5d73c56
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,9 @@
+language: python
+python: "2.7"
+install:
+  - mkdir -p buildout-cache/eggs
+  - mkdir -p buildout-cache/downloads
+  - python bootstrap.py -c travis.cfg
+  - bin/buildout -N -t 3 -c travis.cfg install download install
+  - bin/buildout -N -t 3 -c travis.cfg
+script: bin/test
diff --git a/buildout.cfg b/buildout.cfg
index 4e92e4d..ec4cc44 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -1,15 +1,16 @@
+# Note: you need to create two directories manually:
+# mkdir -p buildout-cache/eggs
+# mkdir -p buildout-cache/downloads
 [buildout]
 extends =
     https://raw.github.com/collective/buildout.plonetest/master/test-4.x.cfg
 package-name = Products.feedfeeder
 
 
-[instance]
-eggs +=
-    Products.feedfeeder
-
-
 [versions]
 BeautifulSoup = 3.2.1
+# We keep using feedparser 4.1 in the tests.  Plone pins this to 5.0.1,
+# but that gives errors during testing.  We should fix those, but it
+# seems everything works fine in a real website, also in Plone 4.3.
 FeedParser = 4.1
 feedparser = 4.1
diff --git a/travis.cfg b/travis.cfg
new file mode 100644
index 0000000..64a3b9f
--- /dev/null
+++ b/travis.cfg
@@ -0,0 +1,7 @@
+[buildout]
+extends =
+    buildout.cfg
+    https://raw.github.com/collective/buildout.plonetest/master/travis-4.x.cfg
+# Yes, this is needed here, too:
+package-name = Products.feedfeeder
+#package-extras = [test]