diff --git a/http/org_service.go b/http/org_service.go
index ad56f2c4de..c087450f4a 100644
--- a/http/org_service.go
+++ b/http/org_service.go
@@ -40,6 +40,14 @@ type orgsResponse struct {
 	Organizations []*orgResponse    `json:"orgs"`
 }
 
+func (o orgsResponse) ToPlatform() []*platform.Organization {
+	orgs := make([]*platform.Organization, len(o.Organizations))
+	for i := range o.Organizations {
+		orgs[i] = &o.Organizations[i].Organization
+	}
+	return orgs
+}
+
 func newOrgsResponse(orgs []*platform.Organization) *orgsResponse {
 	res := orgsResponse{
 		Links: map[string]string{
@@ -296,11 +304,13 @@ type OrganizationService struct {
 	InsecureSkipVerify bool
 }
 
+// FindOrganizationByID gets a single organization with a given id using HTTP.
 func (s *OrganizationService) FindOrganizationByID(ctx context.Context, id platform.ID) (*platform.Organization, error) {
 	filter := platform.OrganizationFilter{ID: &id}
 	return s.FindOrganization(ctx, filter)
 }
 
+// FindOrganization gets a single organization matching the filter using HTTP.
 func (s *OrganizationService) FindOrganization(ctx context.Context, filter platform.OrganizationFilter) (*platform.Organization, error) {
 	os, n, err := s.FindOrganizations(ctx, filter)
 	if err != nil {
@@ -314,6 +324,7 @@ func (s *OrganizationService) FindOrganization(ctx context.Context, filter platf
 	return os[0], nil
 }
 
+// FindOrganizations returns all organizations that match the filter via HTTP.
 func (s *OrganizationService) FindOrganizations(ctx context.Context, filter platform.OrganizationFilter, opt ...platform.FindOptions) ([]*platform.Organization, int, error) {
 	url, err := newURL(s.Addr, organizationPath)
 	if err != nil {
@@ -346,12 +357,13 @@ func (s *OrganizationService) FindOrganizations(ctx context.Context, filter plat
 		return nil, 0, err
 	}
 
-	var os []*platform.Organization
+	var os orgsResponse
 	if err := json.NewDecoder(resp.Body).Decode(&os); err != nil {
 		return nil, 0, err
 	}
 
-	return os, len(os), nil
+	orgs := os.ToPlatform()
+	return orgs, len(orgs), nil
 
 }
 
@@ -398,6 +410,7 @@ func (s *OrganizationService) CreateOrganization(ctx context.Context, o *platfor
 	return nil
 }
 
+// UpdateOrganization updates the organization over HTTP.
 func (s *OrganizationService) UpdateOrganization(ctx context.Context, id platform.ID, upd platform.OrganizationUpdate) (*platform.Organization, error) {
 	u, err := newURL(s.Addr, organizationIDPath(id))
 	if err != nil {
@@ -437,6 +450,7 @@ func (s *OrganizationService) UpdateOrganization(ctx context.Context, id platfor
 	return &o, nil
 }
 
+// DeleteOrganization removes organization id over HTTP.
 func (s *OrganizationService) DeleteOrganization(ctx context.Context, id platform.ID) error {
 	u, err := newURL(s.Addr, organizationIDPath(id))
 	if err != nil {
diff --git a/http/org_test.go b/http/org_test.go
new file mode 100644
index 0000000000..906afe9f96
--- /dev/null
+++ b/http/org_test.go
@@ -0,0 +1,61 @@
+package http
+
+import (
+	"context"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/influxdata/platform"
+	"github.com/influxdata/platform/inmem"
+	platformtesting "github.com/influxdata/platform/testing"
+)
+
+func initOrganizationService(f platformtesting.OrganizationFields, t *testing.T) (platform.OrganizationService, func()) {
+	t.Helper()
+	svc := inmem.NewService()
+	svc.IDGenerator = f.IDGenerator
+
+	ctx := context.TODO()
+	for _, o := range f.Organizations {
+		if err := svc.PutOrganization(ctx, o); err != nil {
+			t.Fatalf("failed to populate organizations")
+		}
+	}
+
+	handler := NewOrgHandler()
+	handler.OrganizationService = svc
+	handler.BucketService = svc
+	server := httptest.NewServer(handler)
+	client := OrganizationService{
+		Addr: server.URL,
+	}
+	done := func() {
+		server.Close()
+	}
+
+	return &client, done
+}
+
+func TestOrganizationService_CreateOrganization(t *testing.T) {
+	platformtesting.CreateOrganization(initOrganizationService, t)
+}
+
+func TestOrganizationService_FindOrganizationByID(t *testing.T) {
+	platformtesting.FindOrganizationByID(initOrganizationService, t)
+}
+
+func TestOrganizationService_FindOrganizations(t *testing.T) {
+	platformtesting.FindOrganizations(initOrganizationService, t)
+}
+
+func TestOrganizationService_DeleteOrganization(t *testing.T) {
+	platformtesting.DeleteOrganization(initOrganizationService, t)
+}
+
+func TestOrganizationService_FindOrganization(t *testing.T) {
+	platformtesting.FindOrganization(initOrganizationService, t)
+}
+
+func TestOrganizationService_UpdateOrganization(t *testing.T) {
+	platformtesting.UpdateOrganization(initOrganizationService, t)
+}