diff --git a/models/fixtures/teams.yml b/models/fixtures/teams.yml
new file mode 100644
index 000000000..dab8f9134
--- /dev/null
+++ b/models/fixtures/teams.yml
@@ -0,0 +1,5 @@
+-
+  id: 1
+  name: testteam1
+  description: Lorem Ipsum
+  created_by_id: 1
\ No newline at end of file
diff --git a/models/teams_test.go b/models/teams_test.go
new file mode 100644
index 000000000..562bb87b0
--- /dev/null
+++ b/models/teams_test.go
@@ -0,0 +1,85 @@
+package models
+
+import (
+	"testing"
+	"github.com/stretchr/testify/assert"
+	"reflect"
+)
+
+func TestTeam_Create(t *testing.T) {
+	//Dummyteam
+	dummyteam := Team{
+		Name:"Testteam293",
+		Description:"Lorem Ispum",
+	}
+
+	// Doer
+	doer, _, err := GetUserByID(1)
+	assert.NoError(t, err)
+
+	// Insert it
+	assert.True(t, dummyteam.CanCreate(&doer))
+	err = dummyteam.Create(&doer)
+	assert.NoError(t, err)
+
+	// Check if it was inserted and we're admin
+	tm := Team{ID:dummyteam.ID}
+	err = tm.ReadOne()
+	assert.NoError(t, err)
+	assert.Equal(t, 1, len(tm.Members))
+	assert.Equal(t, doer.ID, tm.Members[0].User.ID)
+	assert.True(t, tm.Members[0].Admin)
+	assert.True(t, dummyteam.CanRead(&doer))
+
+	// Get all teams the user is part of
+	ts, err := tm.ReadAll(&doer)
+	assert.NoError(t, err)
+	assert.Equal(t, reflect.TypeOf(ts).Kind(), reflect.Slice)
+	s := reflect.ValueOf(ts)
+	assert.Equal(t, 1, s.Len())
+
+	// Check inserting it with an empty name
+	dummyteam.Name = ""
+	err = dummyteam.Create(&doer)
+	assert.Error(t, err)
+	assert.True(t, IsErrTeamNameCannotBeEmpty(err))
+
+	// update it (still no name, should fail)
+	assert.True(t, dummyteam.CanUpdate(&doer))
+	err = dummyteam.Update()
+	assert.Error(t, err)
+	assert.True(t, IsErrTeamNameCannotBeEmpty(err))
+
+	// Update it, this time with a name
+	dummyteam.Name = "Lorem"
+	err = dummyteam.Update()
+	assert.NoError(t, err)
+
+	// Delete it
+	assert.True(t, dummyteam.CanDelete(&doer))
+	err = dummyteam.Delete()
+	assert.NoError(t, err)
+
+	// Try deleting a (now) nonexistant team
+	err = dummyteam.Delete()
+	assert.Error(t, err)
+	assert.True(t, IsErrTeamDoesNotExist(err))
+
+	// Try updating the (now) nonexistant team
+	err = dummyteam.Update()
+	assert.Error(t, err)
+	assert.True(t, IsErrTeamDoesNotExist(err))
+}
+
+func TestIsErrInvalidTeamRight(t *testing.T) {
+	assert.NoError(t, TeamRightAdmin.isValid())
+	assert.NoError(t, TeamRightRead.isValid())
+	assert.NoError(t, TeamRightWrite.isValid())
+
+	// Check invalid
+	var tr TeamRight
+	tr = 938
+	err := tr.isValid()
+	assert.Error(t, err)
+	assert.True(t, IsErrInvalidTeamRight(err))
+}