In this paper we study continuous bundles of C*-algebras which are non-commutative analogues of principal torus bundles. We show that all such bundles, although in general being very far away from being locally trivial bundles, are at least locally RKK-trivial. Using earlier results of Echterhoff and Williams, we shall give a complete classification of principal non-commutative torus bundles up to T-n-equivariant Morita equivalence. We then study these bundles as topological fibrations (forgetting the group action) and give necessary and sufficient conditions for any non-commutative principal torus bundle being RKK-equivalent to a commutative one. As an application of our methods we shall also give a K-theoretic characterization of those principal T-n-bundles with H-flux, as studied by Mathai and Rosenberg which possess 'classical' T-duals.