diff --git a/.travis.yml b/.travis.yml
index 269f3ee..b52758e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,19 @@
+sudo: false
 language: go
+
 go:
   - 1.5.4
   - 1.6.2
   - tip
 
+os:
+  - linux
+  - osx
+
 matrix:
   allow_failures:
     - go: tip
-	
+
 script:
   - go test -v ./...
   - go build
diff --git a/const_bsds.go b/const_bsds.go
index 9717374..5728243 100644
--- a/const_bsds.go
+++ b/const_bsds.go
@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build darwin openbsd freebsd
+// +build darwin openbsd freebsd netbsd dragonfly
 
 package afero
 
diff --git a/const_win_unix.go b/const_win_unix.go
index d8f392b..968fc27 100644
--- a/const_win_unix.go
+++ b/const_win_unix.go
@@ -13,6 +13,8 @@
 // +build !darwin
 // +build !openbsd
 // +build !freebsd
+// +build !dragonfly
+// +build !netbsd
 
 package afero
 
diff --git a/memmap.go b/memmap.go
index f577ac8..2e259b8 100644
--- a/memmap.go
+++ b/memmap.go
@@ -66,7 +66,7 @@
 	}
 	parent := m.findParent(f)
 	if parent == nil {
-		log.Fatal("parent of ", f.Name(), " is nil")
+		log.Panic("parent of ", f.Name(), " is nil")
 	}
 	mem.RemoveFromMemDir(parent, f)
 	return nil
diff --git a/util.go b/util.go
index 2fa8402..cec6f8f 100644
--- a/util.go
+++ b/util.go
@@ -46,7 +46,7 @@
 		err = fs.MkdirAll(ospath, 0777) // rwx, rw, r
 		if err != nil {
 			if err != os.ErrExist {
-				log.Fatalln(err)
+				log.Panicln(err)
 			}
 		}
 	}