diff --git a/.travis.yml b/.travis.yml
index adcd0da..7aa6efb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -64,16 +64,11 @@
       BUILD_ARG="--without-csharp --without-java --without-erlang --without-nodejs --without-lua --without-python --without-perl --without-php --without-php_extension --without-dart --without-ruby --without-haskell --without-go --without-haxe --without-d"
       BUILD_ENV="-e CC=gcc -e CXX=g++"
 
-    - TEST_NAME="Java Lua Perl PHP Python Ruby (automake)"
+    - TEST_NAME="Java Lua Perl PHP Python Ruby Dart (automake)"
       BUILD_CMD="../autotools.sh"
-      BUILD_ARG="--without-cpp --without-haskell --without-c_glib --without-csharp --without-d --without-dart --without-erlang --without-go --without-haxe"
+      BUILD_ARG="--without-cpp --without-haskell --without-c_glib --without-csharp --without-d --without-erlang --without-go --without-haxe"
 
-    # Tutorial build is unstable
-    - TEST_NAME="Dart (automake)"
-      BUILD_CMD="../autotools.sh"
-      BUILD_ARG="--without-cpp --without-haskell --without-c_glib --without-csharp --without-d --without-erlang --without-go --without-haxe --without-java --without-lua --without-nodejs --without-perl --without-php --without-php_extension --without-python --without-ruby --enable-tutorial=no"
-
-    # These are flaky and also have lengthy output
+    # These are flaky (due to cabal and npm network/server failures) and also have lengthy output
     - TEST_NAME="Haskell Node.js (automake)"
       BUILD_CMD="../autotools.sh"
       BUILD_ARG="--without-cpp --without-c_glib --without-csharp --without-d --without-dart --without-erlang --without-go --without-haxe --without-java --without-lua --without-perl --without-php --without-php_extension --without-python --without-ruby"
diff --git a/tutorial/dart/Makefile.am b/tutorial/dart/Makefile.am
index 2bb6bf2..306864c 100644
--- a/tutorial/dart/Makefile.am
+++ b/tutorial/dart/Makefile.am
@@ -17,6 +17,8 @@
 # under the License.
 #
 
+BUILT_SOURCES = gen-dart/tutorial/lib/tutorial.dart gen-dart/shared/lib/shared.dart
+
 THRIFT = $(top_builddir)/compiler/cpp/thrift
 
 gen-dart/tutorial/lib/tutorial.dart gen-dart/shared/lib/shared.dart: $(top_srcdir)/tutorial/tutorial.thrift
@@ -44,7 +46,7 @@
 	cd console_client; ${DARTPUB} get
 
 pub-get-server:
-	cd client; ${DARTPUB} get
+	cd server; ${DARTPUB} get
 
 tutorialserver: pub-get-gen pub-get-server
 	${DART} server/bin/main.dart
@@ -53,4 +55,4 @@
 	cd client; ${DARTPUB} serve
 
 tutorialconsoleclient: pub-get-console-client
-	${DART} console-client/bin/main.dart
+	${DART} console_client/bin/main.dart